From d35e8bb21b0026b7dfe2f4cfdfa288708c6ef4a0 Mon Sep 17 00:00:00 2001
From: jurgenhaas <juergen.haas@lakedrops.com>
Date: Mon, 25 Mar 2024 09:47:54 +0100
Subject: [PATCH] gitlab-ci-cd/general#17 Add "--retry 2" to all curl commands
---
data-handling-ng.yml | 2 +-
mr-proposed-changes.yml | 2 +-
scripts/mr-proposed-changes.sh | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/data-handling-ng.yml b/data-handling-ng.yml
index 9379f7b..96e5d39 100644
--- a/data-handling-ng.yml
+++ b/data-handling-ng.yml
@@ -43,7 +43,7 @@ CollectConfig:
- merge
- TARGETBRANCH=main merge
- |
- curl --fail -X DELETE -s -H "PRIVATE-TOKEN: ${GITLAB_PRIVATE_TOKEN}" "https://${CI_SERVER_HOST}/api/v4/projects/${CI_PROJECT_ID}/repository/branches/cc-${CI_JOB_ID}"
+ curl --fail --retry 2 -X DELETE -s -H "PRIVATE-TOKEN: ${GITLAB_PRIVATE_TOKEN}" "https://${CI_SERVER_HOST}/api/v4/projects/${CI_PROJECT_ID}/repository/branches/cc-${CI_JOB_ID}"
cache: {}
only:
refs:
diff --git a/mr-proposed-changes.yml b/mr-proposed-changes.yml
index 1f5491b..9fe0ca2 100644
--- a/mr-proposed-changes.yml
+++ b/mr-proposed-changes.yml
@@ -4,6 +4,6 @@
rules:
- if: $CI_PIPELINE_SOURCE == "schedule"
after_script:
- - curl --fail https://gitlab.lakedrops.com/gitlab-ci-cd/drupal/-/raw/main/scripts/mr-proposed-changes.sh -o /tmp/mr-proposed-changes.sh
+ - curl --fail --retry 2 https://gitlab.lakedrops.com/gitlab-ci-cd/drupal/-/raw/main/scripts/mr-proposed-changes.sh -o /tmp/mr-proposed-changes.sh
- chmod +x /tmp/mr-proposed-changes.sh
- HOST=${CI_PROJECT_URL} CI_PROJECT_ID=${CI_PROJECT_ID} CI_COMMIT_REF_NAME=${CI_COMMIT_REF_NAME} GITLAB_USER_ID=${GITLAB_USER_ID} GITLAB_USER_LOGIN=${GITLAB_USER_LOGIN} GITLAB_USER_NAME=${GITLAB_USER_NAME} GITLAB_USER_EMAIL=${GITLAB_USER_EMAIL} ACCESS_TOKEN=${ACCESS_TOKEN} /tmp/mr-proposed-changes.sh
diff --git a/scripts/mr-proposed-changes.sh b/scripts/mr-proposed-changes.sh
index 81a0b8e..861d440 100755
--- a/scripts/mr-proposed-changes.sh
+++ b/scripts/mr-proposed-changes.sh
@@ -40,7 +40,7 @@ git commit -am "GitLab CI proposed changes"
git push -u mr ${SOURCE_BRANCH}
# Create MR
-curl --fail -X POST "${HOST}${CI_PROJECT_ID}/merge_requests" \
+curl --fail --retry 2 -X POST "${HOST}${CI_PROJECT_ID}/merge_requests" \
--header "PRIVATE-TOKEN:${ACCESS_TOKEN}" \
--header "Content-Type: application/json" \
--data "${BODY}";
--
GitLab