Skip to content
Snippets Groups Projects
Commit 7de8e5e7 authored by Pierre Smeyers's avatar Pierre Smeyers
Browse files

Merge branch 'master' into 'master'

fix: skip k8s-jobs when *_SPACE variables are empty

Closes #45

See merge request to-be-continuous/kubernetes!79
parents 2a863d3d 83404bf4
No related branches found
No related tags found
No related merge requests found
...@@ -894,7 +894,7 @@ k8s-review: ...@@ -894,7 +894,7 @@ k8s-review:
- if: $CI_COMMIT_TAG - if: $CI_COMMIT_TAG
when: never when: never
# only on non-production, non-integration branches, with $K8S_REVIEW_SPACE set # only on non-production, non-integration branches, with $K8S_REVIEW_SPACE set
- if: '$K8S_REVIEW_SPACE && $CI_COMMIT_REF_NAME !~ $PROD_REF && $CI_COMMIT_REF_NAME !~ $INTEG_REF' - if: '$K8S_REVIEW_SPACE != "" && $CI_COMMIT_REF_NAME !~ $PROD_REF && $CI_COMMIT_REF_NAME !~ $INTEG_REF'
# stop review env (automatically triggered once branches are deleted) # stop review env (automatically triggered once branches are deleted)
k8s-cleanup-review: k8s-cleanup-review:
...@@ -916,7 +916,7 @@ k8s-cleanup-review: ...@@ -916,7 +916,7 @@ k8s-cleanup-review:
- if: $CI_COMMIT_TAG - if: $CI_COMMIT_TAG
when: never when: never
# only on non-production, non-integration branches, with $K8S_REVIEW_SPACE set # only on non-production, non-integration branches, with $K8S_REVIEW_SPACE set
- if: '$K8S_REVIEW_SPACE && $CI_COMMIT_REF_NAME !~ $PROD_REF && $CI_COMMIT_REF_NAME !~ $INTEG_REF' - if: '$K8S_REVIEW_SPACE != "" && $CI_COMMIT_REF_NAME !~ $PROD_REF && $CI_COMMIT_REF_NAME !~ $INTEG_REF'
when: manual when: manual
allow_failure: true allow_failure: true
...@@ -936,7 +936,7 @@ k8s-integration: ...@@ -936,7 +936,7 @@ k8s-integration:
resource_group: integration resource_group: integration
rules: rules:
# only on integration branch(es), with $K8S_INTEG_SPACE set # only on integration branch(es), with $K8S_INTEG_SPACE set
- if: '$K8S_INTEG_SPACE && $CI_COMMIT_REF_NAME =~ $INTEG_REF' - if: '$K8S_INTEG_SPACE != "" && $CI_COMMIT_REF_NAME =~ $INTEG_REF'
############################### ###############################
# Staging deploys are disabled by default since # Staging deploys are disabled by default since
...@@ -961,7 +961,7 @@ k8s-staging: ...@@ -961,7 +961,7 @@ k8s-staging:
resource_group: staging resource_group: staging
rules: rules:
# only on production branch(es), with $K8S_STAGING_SPACE set # only on production branch(es), with $K8S_STAGING_SPACE set
- if: '$K8S_STAGING_SPACE && $CI_COMMIT_REF_NAME =~ $PROD_REF' - if: '$K8S_STAGING_SPACE != "" && $CI_COMMIT_REF_NAME =~ $PROD_REF'
k8s-production: k8s-production:
extends: .k8s-deploy extends: .k8s-deploy
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment