From a9a09ecb768614461c786ba60f339900f48f265a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christian=20B=C3=B6ttcher?= <c.boettcher@fz-juelich.de>
Date: Tue, 14 Feb 2023 09:56:54 +0100
Subject: [PATCH] fix conditions in CI/CD jobs
---
.gitlab-ci.yml | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b6d4a11..2cd60eb 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -88,8 +88,7 @@ full-deploy-testing:
light-deploy-testing:
stage: deploy
rules:
- - if: $MANUAL_FULL_DEPLOY_TESTING == "" || $MANUAL_FULL_DEPLOY_TESTING == "false"
- when: tags
+ - if: ($CI_COMMIT_BRANCH == "master" && ($MANUAL_FULL_DEPLOY_TESTING == "" || $MANUAL_FULL_DEPLOY_TESTING == "false))"
<<: *ssh_setup
environment: Testing
script:
@@ -102,8 +101,7 @@ full-deploy-production:
stage: deploy
environment: Production
rules:
- - if: $MANUAL_FULL_DEPLOY_PRODUCTION == "true"
- when: tags
+ - if: ($CI_COMMIT_TAG =~ /stable/ && $MANUAL_FULL_DEPLOY_PRODUCTION == "true")
<<: *ssh_setup
script:
- echo "Starting the full production deployment of airflows."
@@ -133,7 +131,7 @@ full-deploy-production:
light-deploy-production:
stage: deploy
rules:
- - if: $MANUAL_FULL_DEPLOY_PRODUCTION == "" || $MANUAL_FULL_DEPLOY_PRODUCTION == "false"
+ - if: ($CI_COMMIT_TAG =~ /stable/ && ($MANUAL_FULL_DEPLOY_PRODUCTION == "" || $MANUAL_FULL_DEPLOY_PRODUCTION == "false"))
when: tags
<<: *ssh_setup
environment: Production
--
GitLab