From 1fe04626f02f513dba291dd989e3fa9eb54ee48e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Burak=20Han=C3=A7erli?= <burak.hancerli@qt.io>
Date: Wed, 25 Oct 2023 09:31:23 +0000
Subject: [PATCH] QDS-11027 Move prod deployment to after release creation
---
cicd/gitlab-ci.yml | 1 -
cicd/stages/build.yml | 32 --------------------------------
cicd/stages/trigger.yml | 34 ++++++++++++++++++++++++++++++++++
3 files changed, 34 insertions(+), 33 deletions(-)
create mode 100644 cicd/stages/trigger.yml
diff --git a/cicd/gitlab-ci.yml b/cicd/gitlab-ci.yml
index cc1e883..33058bb 100644
--- a/cicd/gitlab-ci.yml
+++ b/cicd/gitlab-ci.yml
@@ -14,7 +14,6 @@ workflow:
stages:
- build
- - trigger
- release
include:
diff --git a/cicd/stages/build.yml b/cicd/stages/build.yml
index 6365f61..fbcdc4d 100644
--- a/cicd/stages/build.yml
+++ b/cicd/stages/build.yml
@@ -74,35 +74,3 @@ build-wasm-multiarch:
- cmake --install ${QDS_BUILD_PATH}
- echo "PREVIOUS_JOB_ID=${CI_JOB_ID}" >> build.env
- echo "JOB_TARGET_ARCH=${QDS_CI_JOB_TARGET_ARCH}" >> build.env
-
-.trigger-common:
- stage : trigger
- variables: # these variables are passed to the downstream pipeline
- QDS_CI_PARENT_PIPELINE_ID: ${CI_PIPELINE_ID}
- QDS_CI_ARTIFACT_JOB_ID: ${PREVIOUS_JOB_ID}
- QDS_CI_PARENT_PROJECT_ID: ${CI_PROJECT_ID}
- QDS_CI_PARENT_PIPELINE_ARCH: ${JOB_TARGET_ARCH}
- needs:
- - job: build-wasm-multiarch
- artifacts: true
- optional: true
- trigger:
- project: design-studio/design-viewer/design-viewer-web-service
- branch: master
- strategy: depend
- forward:
- yaml_variables: true
- pipeline_variables: false
-
-trigger-test-deployment:
- extends: .trigger-common
- rules:
- - if: $CI_COMMIT_TAG == null
-
-
-trigger-prod-deployment:
- extends: .trigger-common
- rules:
- - if: $CI_COMMIT_TAG
- variables:
- QDS_CI_PARENT_PIPELINE_RELEASE_TAG: $CI_COMMIT_TAG
diff --git a/cicd/stages/trigger.yml b/cicd/stages/trigger.yml
new file mode 100644
index 0000000..c01011c
--- /dev/null
+++ b/cicd/stages/trigger.yml
@@ -0,0 +1,34 @@
+# these are trigger jobs for the downstream pipeline in Design Viewer Web Service project
+.trigger-common:
+ variables: # these variables are passed to the downstream pipeline
+ QDS_CI_PARENT_PIPELINE_ID: ${CI_PIPELINE_ID}
+ QDS_CI_ARTIFACT_JOB_ID: ${PREVIOUS_JOB_ID}
+ QDS_CI_PARENT_PROJECT_ID: ${CI_PROJECT_ID}
+ QDS_CI_PARENT_PIPELINE_ARCH: ${JOB_TARGET_ARCH}
+ needs:
+ - job: build-wasm-multiarch
+ artifacts: true
+ optional: true
+ trigger:
+ project: design-studio/design-viewer/design-viewer-web-service
+ branch: master
+ strategy: depend
+ forward:
+ yaml_variables: true
+ pipeline_variables: false
+
+trigger-test-deployment:
+ extends: .trigger-common
+ stage: build
+ rules:
+ - if: $CI_COMMIT_TAG == null
+
+trigger-prod-deployment:
+ extends: .trigger-common
+ stage: release
+ rules:
+ - if: $CI_COMMIT_TAG
+ needs:
+ - job: create-release
+ variables:
+ QDS_CI_PARENT_PIPELINE_RELEASE_TAG: $CI_COMMIT_TAG
--
GitLab