From abda18df2b0c334253ac4037ef643d944529c7da Mon Sep 17 00:00:00 2001 From: Tobias Kuhnert <tobias.kiuhnert@ufz.de> Date: Thu, 20 Feb 2025 08:21:34 +0100 Subject: [PATCH 1/9] trigger webhook for stage deployment in ci/cd pipeline --- .gitlab/ci/common.gitlab-ci.yml | 1 + .gitlab/ci/notify.gitlab-ci.yml | 10 ++++++++++ 2 files changed, 11 insertions(+) create mode 100644 .gitlab/ci/notify.gitlab-ci.yml diff --git a/.gitlab/ci/common.gitlab-ci.yml b/.gitlab/ci/common.gitlab-ci.yml index 66ff6b24..bd414fb7 100644 --- a/.gitlab/ci/common.gitlab-ci.yml +++ b/.gitlab/ci/common.gitlab-ci.yml @@ -5,6 +5,7 @@ stages: - "end-to-end" - "scan" - "release" + - "notify" variables: DOCKER_TLS_CERTDIR: "/certs" diff --git a/.gitlab/ci/notify.gitlab-ci.yml b/.gitlab/ci/notify.gitlab-ci.yml new file mode 100644 index 00000000..16e48cd8 --- /dev/null +++ b/.gitlab/ci/notify.gitlab-ci.yml @@ -0,0 +1,10 @@ +--- + +trigger_stage_deployment: + stage: notify + script: + - curl -X POST "https://git.ufz.de/api/v4/projects/3977/ref/main/trigger/pipeline" + -F "token=$PIPELINE_TOKEN" + only: + - main + when: on_success -- GitLab From f13d153444a544a31d5cc24e160b7e0fb91f0b75 Mon Sep 17 00:00:00 2001 From: Tobias Kuhnert <tobias.kiuhnert@ufz.de> Date: Thu, 20 Feb 2025 08:23:54 +0100 Subject: [PATCH 2/9] testing also an current branch --- .gitlab/ci/notify.gitlab-ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitlab/ci/notify.gitlab-ci.yml b/.gitlab/ci/notify.gitlab-ci.yml index 16e48cd8..de785aec 100644 --- a/.gitlab/ci/notify.gitlab-ci.yml +++ b/.gitlab/ci/notify.gitlab-ci.yml @@ -3,8 +3,8 @@ trigger_stage_deployment: stage: notify script: - - curl -X POST "https://git.ufz.de/api/v4/projects/3977/ref/main/trigger/pipeline" + - curl -X POST "https://git.ufz.de/api/v4/projects/3977/ref/main/trigger/pipeline" \ -F "token=$PIPELINE_TOKEN" - only: - - main +# only: +# - main when: on_success -- GitLab From 44a1330ebed81898f2008560a6260018a29938b4 Mon Sep 17 00:00:00 2001 From: Tobias Kuhnert <tobias.kiuhnert@ufz.de> Date: Thu, 20 Feb 2025 09:01:41 +0100 Subject: [PATCH 3/9] install curl in pipeline --- .gitlab/ci/notify.gitlab-ci.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitlab/ci/notify.gitlab-ci.yml b/.gitlab/ci/notify.gitlab-ci.yml index de785aec..09ac41fc 100644 --- a/.gitlab/ci/notify.gitlab-ci.yml +++ b/.gitlab/ci/notify.gitlab-ci.yml @@ -2,7 +2,9 @@ trigger_stage_deployment: stage: notify + image: "docker:${DOCKER_IMAGE_TAG}" script: + - apk add --no-cache curl - curl -X POST "https://git.ufz.de/api/v4/projects/3977/ref/main/trigger/pipeline" \ -F "token=$PIPELINE_TOKEN" # only: -- GitLab From 37be5a49d8daa414a3da11d1dbe924eacab677a5 Mon Sep 17 00:00:00 2001 From: Tobias Kuhnert <tobias.kiuhnert@ufz.de> Date: Thu, 20 Feb 2025 09:02:47 +0100 Subject: [PATCH 4/9] renamed token variable --- .gitlab/ci/notify.gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab/ci/notify.gitlab-ci.yml b/.gitlab/ci/notify.gitlab-ci.yml index 09ac41fc..ba43759b 100644 --- a/.gitlab/ci/notify.gitlab-ci.yml +++ b/.gitlab/ci/notify.gitlab-ci.yml @@ -6,7 +6,7 @@ trigger_stage_deployment: script: - apk add --no-cache curl - curl -X POST "https://git.ufz.de/api/v4/projects/3977/ref/main/trigger/pipeline" \ - -F "token=$PIPELINE_TOKEN" + -F "token=$PIPELINE_TOKEN_STAGE" # only: # - main when: on_success -- GitLab From b9761c912f07edf1df9ba539c387bd1f0b600558 Mon Sep 17 00:00:00 2001 From: Tobias Kuhnert <tobias.kiuhnert@ufz.de> Date: Thu, 20 Feb 2025 09:29:39 +0100 Subject: [PATCH 5/9] updated url --- .gitlab/ci/notify.gitlab-ci.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitlab/ci/notify.gitlab-ci.yml b/.gitlab/ci/notify.gitlab-ci.yml index ba43759b..5de1ca17 100644 --- a/.gitlab/ci/notify.gitlab-ci.yml +++ b/.gitlab/ci/notify.gitlab-ci.yml @@ -5,8 +5,9 @@ trigger_stage_deployment: image: "docker:${DOCKER_IMAGE_TAG}" script: - apk add --no-cache curl - - curl -X POST "https://git.ufz.de/api/v4/projects/3977/ref/main/trigger/pipeline" \ - -F "token=$PIPELINE_TOKEN_STAGE" + - curl -X POST "https://git.ufz.de/api/v4/projects/3977/trigger/pipeline" \ + -F "token=$PIPELINE_TOKEN_STAGE" \ + -F "ref=main" # only: # - main when: on_success -- GitLab From 2a4492fd84b043bb01fdf3eb1383e2c0415108f8 Mon Sep 17 00:00:00 2001 From: Tobias Kuhnert <tobias.kiuhnert@ufz.de> Date: Thu, 20 Feb 2025 09:48:41 +0100 Subject: [PATCH 6/9] for testing changed job to the beginning --- .gitlab/ci/common.gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab/ci/common.gitlab-ci.yml b/.gitlab/ci/common.gitlab-ci.yml index bd414fb7..54feb92e 100644 --- a/.gitlab/ci/common.gitlab-ci.yml +++ b/.gitlab/ci/common.gitlab-ci.yml @@ -1,11 +1,11 @@ --- stages: + - "notify" - "check" - "integration" - "end-to-end" - "scan" - "release" - - "notify" variables: DOCKER_TLS_CERTDIR: "/certs" -- GitLab From 3b06a9bdf1fd693dd9e60ec2dcc4a34df7dcf3b0 Mon Sep 17 00:00:00 2001 From: Tobias Kuhnert <tobias.kiuhnert@ufz.de> Date: Thu, 20 Feb 2025 09:50:35 +0100 Subject: [PATCH 7/9] testing with one line curl command --- .gitlab/ci/notify.gitlab-ci.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.gitlab/ci/notify.gitlab-ci.yml b/.gitlab/ci/notify.gitlab-ci.yml index 5de1ca17..75e111ed 100644 --- a/.gitlab/ci/notify.gitlab-ci.yml +++ b/.gitlab/ci/notify.gitlab-ci.yml @@ -5,9 +5,7 @@ trigger_stage_deployment: image: "docker:${DOCKER_IMAGE_TAG}" script: - apk add --no-cache curl - - curl -X POST "https://git.ufz.de/api/v4/projects/3977/trigger/pipeline" \ - -F "token=$PIPELINE_TOKEN_STAGE" \ - -F "ref=main" + - curl -X POST "https://git.ufz.de/api/v4/projects/3977/trigger/pipeline" -F "token=$PIPELINE_TOKEN_STAGE" -F "ref=main" # only: # - main when: on_success -- GitLab From 1afdf8e00669e1878b897b87fdc053c9f5a33d4e Mon Sep 17 00:00:00 2001 From: Tobias Kuhnert <tobias.kiuhnert@ufz.de> Date: Thu, 20 Feb 2025 09:55:44 +0100 Subject: [PATCH 8/9] run on main at the end --- .gitlab/ci/common.gitlab-ci.yml | 2 +- .gitlab/ci/notify.gitlab-ci.yml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitlab/ci/common.gitlab-ci.yml b/.gitlab/ci/common.gitlab-ci.yml index 54feb92e..bd414fb7 100644 --- a/.gitlab/ci/common.gitlab-ci.yml +++ b/.gitlab/ci/common.gitlab-ci.yml @@ -1,11 +1,11 @@ --- stages: - - "notify" - "check" - "integration" - "end-to-end" - "scan" - "release" + - "notify" variables: DOCKER_TLS_CERTDIR: "/certs" diff --git a/.gitlab/ci/notify.gitlab-ci.yml b/.gitlab/ci/notify.gitlab-ci.yml index 75e111ed..e88e1513 100644 --- a/.gitlab/ci/notify.gitlab-ci.yml +++ b/.gitlab/ci/notify.gitlab-ci.yml @@ -6,6 +6,6 @@ trigger_stage_deployment: script: - apk add --no-cache curl - curl -X POST "https://git.ufz.de/api/v4/projects/3977/trigger/pipeline" -F "token=$PIPELINE_TOKEN_STAGE" -F "ref=main" -# only: -# - main + only: + - main when: on_success -- GitLab From f13c2acb23b2feffde77a56be9fceb12d30384a7 Mon Sep 17 00:00:00 2001 From: Tobias Kuhnert <tobias.kuhnert@ufz.de> Date: Fri, 21 Feb 2025 07:49:42 +0100 Subject: [PATCH 9/9] apply suggested comment --- .gitlab/ci/notify.gitlab-ci.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.gitlab/ci/notify.gitlab-ci.yml b/.gitlab/ci/notify.gitlab-ci.yml index e88e1513..5fb2b27c 100644 --- a/.gitlab/ci/notify.gitlab-ci.yml +++ b/.gitlab/ci/notify.gitlab-ci.yml @@ -1,5 +1,8 @@ --- +# This triggers the CI in the deployment repo [1], +# which deploys the latest changes on the stage VM. +# [1] https://git.ufz.de/rdm-software/timeseries-management/tsm-deployment trigger_stage_deployment: stage: notify image: "docker:${DOCKER_IMAGE_TAG}" -- GitLab