From d5c2210ef0dfe7e95344248ff77540cd0e6badaa Mon Sep 17 00:00:00 2001
From: Brandon Clayton <bclayton@usgs.gov>
Date: Mon, 30 Oct 2023 10:43:40 -0600
Subject: [PATCH 1/7] add pipeline name
---
.gitlab-ci.yml | 1 +
1 file changed, 1 insertion(+)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f15043c0..3b8fcba7 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -288,6 +288,7 @@ Trigger nshmp-haz-ws CDK:
--form "variables[SOURCE_PROJECT_NAME]=nshmp-haz-ws" \
--form "variables[ENVIRONMENT]=${ENVIRONMENT}" \
--form "variables[NSHMP_HAZ_WS_IMAGE]=${NSHMP_HAZ_WS_IMAGE}" \
+ --form "variables[CI_PIPELINE_NAME]=Deploy nshmp-haz to ${ENVIRONMENT}" \
"https://${PRIVATE_GITLAB}/api/v4/projects/${NSHMP_CDK_PROJECT_ID}/trigger/pipeline"
- |
curl --request POST \
--
GitLab
From 5e573702bab573951fb9559221584398ef4f8ad8 Mon Sep 17 00:00:00 2001
From: Brandon Clayton <bclayton@usgs.gov>
Date: Mon, 30 Oct 2023 11:02:01 -0600
Subject: [PATCH 2/7] test
---
.gitlab-ci.yml | 1 +
1 file changed, 1 insertion(+)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3b8fcba7..ef5453ae 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -8,6 +8,7 @@ image: ${CI_REGISTRY}/devops/images/usgs/java:11
# Do not run for merge requests
workflow:
+ name: 'Testing Name'
rules:
- if: $CI_COMMIT_TAG
- if: $CI_COMMIT_BRANCH
--
GitLab
From ab545acf4f1d9b325465d67fa2272f68e05faf13 Mon Sep 17 00:00:00 2001
From: Brandon Clayton <bclayton@usgs.gov>
Date: Mon, 30 Oct 2023 11:14:07 -0600
Subject: [PATCH 3/7] test
---
.gitlab-ci.yml | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ef5453ae..c0525ef1 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -8,7 +8,6 @@ image: ${CI_REGISTRY}/devops/images/usgs/java:11
# Do not run for merge requests
workflow:
- name: 'Testing Name'
rules:
- if: $CI_COMMIT_TAG
- if: $CI_COMMIT_BRANCH
@@ -270,6 +269,7 @@ Unit Tests:
####
Trigger nshmp-haz-ws CDK:
+ needs: []
rules:
-
<<: *development-env
@@ -284,12 +284,11 @@ Trigger nshmp-haz-ws CDK:
- |
curl --request POST \
--form token=${NSHMP_CDK_TRIGGER_TOKEN} \
- --form ref=${REF} \
- --form "variables[description]=Triggered by nshmp-haz" \
+ --form ref=pipeline-name \
+ --form "variables[description]=Deploy nshmp-haz to ${ENVIRONMENT}" \
--form "variables[SOURCE_PROJECT_NAME]=nshmp-haz-ws" \
--form "variables[ENVIRONMENT]=${ENVIRONMENT}" \
--form "variables[NSHMP_HAZ_WS_IMAGE]=${NSHMP_HAZ_WS_IMAGE}" \
- --form "variables[CI_PIPELINE_NAME]=Deploy nshmp-haz to ${ENVIRONMENT}" \
"https://${PRIVATE_GITLAB}/api/v4/projects/${NSHMP_CDK_PROJECT_ID}/trigger/pipeline"
- |
curl --request POST \
--
GitLab
From 2431c4ea49e359b96386fd0c3b6d79aa9c1ae686 Mon Sep 17 00:00:00 2001
From: Brandon Clayton <bclayton@usgs.gov>
Date: Mon, 30 Oct 2023 11:17:45 -0600
Subject: [PATCH 4/7] change variable name
---
.gitlab-ci.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c0525ef1..b66bc3af 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -285,7 +285,7 @@ Trigger nshmp-haz-ws CDK:
curl --request POST \
--form token=${NSHMP_CDK_TRIGGER_TOKEN} \
--form ref=pipeline-name \
- --form "variables[description]=Deploy nshmp-haz to ${ENVIRONMENT}" \
+ --form "variables[TRIGGER_DESCRIPTION]=Deploy nshmp-haz to ${ENVIRONMENT}" \
--form "variables[SOURCE_PROJECT_NAME]=nshmp-haz-ws" \
--form "variables[ENVIRONMENT]=${ENVIRONMENT}" \
--form "variables[NSHMP_HAZ_WS_IMAGE]=${NSHMP_HAZ_WS_IMAGE}" \
--
GitLab
From 8cca62be934e325842a1324aa824c0b787262fe1 Mon Sep 17 00:00:00 2001
From: Brandon Clayton <bclayton@usgs.gov>
Date: Mon, 30 Oct 2023 11:26:27 -0600
Subject: [PATCH 5/7] add trigger description
---
.gitlab-ci.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b66bc3af..41cb6f84 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -294,7 +294,7 @@ Trigger nshmp-haz-ws CDK:
curl --request POST \
--form token=${NSHMP_CDK_CORE_TRIGGER_TOKEN} \
--form ref=${REF} \
- --form "variables[description]=Triggered by nshmp-haz" \
+ --form "variables[TRIGGER_DESCRIPTION]=Deploy nshmp-haz to ${ENVIRONMENT}" \
--form "variables[ENVIRONMENT]=${ENVIRONMENT}" \
"https://${PRIVATE_GITLAB}/api/v4/projects/${NSHMP_CDK_CORE_PROJECT_ID}/trigger/pipeline"
stage: trigger
--
GitLab
From b08157ef2f87e0cf52ab51a4499eaa008e7579b9 Mon Sep 17 00:00:00 2001
From: Brandon Clayton <bclayton@usgs.gov>
Date: Mon, 30 Oct 2023 11:26:57 -0600
Subject: [PATCH 6/7] remove needs
---
.gitlab-ci.yml | 1 -
1 file changed, 1 deletion(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 41cb6f84..2d6f4171 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -269,7 +269,6 @@ Unit Tests:
####
Trigger nshmp-haz-ws CDK:
- needs: []
rules:
-
<<: *development-env
--
GitLab
From e408589e1c5e5bd0352b7a8e67b45de43ccda7e2 Mon Sep 17 00:00:00 2001
From: Brandon Clayton <bclayton@usgs.gov>
Date: Mon, 30 Oct 2023 11:29:30 -0600
Subject: [PATCH 7/7] change back to ref variable
---
.gitlab-ci.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2d6f4171..78b41de0 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -283,7 +283,7 @@ Trigger nshmp-haz-ws CDK:
- |
curl --request POST \
--form token=${NSHMP_CDK_TRIGGER_TOKEN} \
- --form ref=pipeline-name \
+ --form ref=${REF} \
--form "variables[TRIGGER_DESCRIPTION]=Deploy nshmp-haz to ${ENVIRONMENT}" \
--form "variables[SOURCE_PROJECT_NAME]=nshmp-haz-ws" \
--form "variables[ENVIRONMENT]=${ENVIRONMENT}" \
--
GitLab