From 71588a384ca086e70f570a6b7c5ad29bea292e9b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ga=C3=ABl=20Br=C3=A9ard?= <gaelbreard@yahoo.fr>
Date: Tue, 9 Nov 2021 14:00:08 +0000
Subject: [PATCH] fix: score and lint jobs are each launched on their
corresponding branch
---
templates/gitlab-ci-helm.yml | 28 ++++++++++++++++------------
1 file changed, 16 insertions(+), 12 deletions(-)
diff --git a/templates/gitlab-ci-helm.yml b/templates/gitlab-ci-helm.yml
index 08fdfbe..c8c7aa8 100644
--- a/templates/gitlab-ci-helm.yml
+++ b/templates/gitlab-ci-helm.yml
@@ -527,7 +527,8 @@ helm-values-review-lint:
rules:
- if: '$CI_MERGE_REQUEST_ID || $HELM_YAMLLINT_DISABLED == "true"'
when: never
- - if: $HELM_REVIEW_VALUES
+ # only on non-production, non-integration branches
+ - if: '$HELM_REVIEW_VALUES && $CI_COMMIT_REF_NAME !~ $PROD_REF && $CI_COMMIT_REF_NAME !~ $INTEG_REF'
helm-values-integration-lint:
extends: .helm-values-lint
@@ -537,7 +538,8 @@ helm-values-integration-lint:
rules:
- if: '$CI_MERGE_REQUEST_ID || $HELM_YAMLLINT_DISABLED == "true"'
when: never
- - if: $HELM_INTEG_VALUES
+ # only on integration branch(es)
+ - if: '$HELM_INTEG_VALUES && $CI_COMMIT_REF_NAME =~ $INTEG_REF'
helm-values-staging-lint:
extends: .helm-values-lint
@@ -547,7 +549,8 @@ helm-values-staging-lint:
rules:
- if: '$CI_MERGE_REQUEST_ID || $HELM_YAMLLINT_DISABLED == "true"'
when: never
- - if: $HELM_STAGING_VALUES
+ # only on production branch(es)
+ - if: '$HELM_STAGING_VALUES && $CI_COMMIT_REF_NAME =~ $PROD_REF'
helm-values-prod-lint:
extends: .helm-values-lint
@@ -557,7 +560,8 @@ helm-values-prod-lint:
rules:
- if: '$CI_MERGE_REQUEST_ID || $HELM_YAMLLINT_DISABLED == "true"'
when: never
- - if: $HELM_PROD_VALUES
+ # only on production branch(es)
+ - if: '$HELM_PROD_VALUES && $CI_COMMIT_REF_NAME =~ $PROD_REF'
helm-review-score:
extends: .helm-score
@@ -571,8 +575,8 @@ helm-review-score:
# exclude when $HELM_KUBE_SCORE_DISABLED is set
- if: '$HELM_KUBE_SCORE_DISABLED == "true"'
when: never
- # else: allow failure
- - if: $HELM_REVIEW_VALUES
+ # else: only on non-production, non-integration branches + allow failure
+ - if: $HELM_REVIEW_VALUES && $CI_COMMIT_REF_NAME !~ $PROD_REF && $CI_COMMIT_REF_NAME !~ $INTEG_REF
exists:
- "**/Chart.yaml"
allow_failure: true
@@ -589,8 +593,8 @@ helm-integration-score:
# exclude when $K8S_SCORE_DISABLED is set
- if: '$HELM_KUBE_SCORE_DISABLED == "true"'
when: never
- # else: allow failure
- - if: $HELM_INTEG_VALUES
+ # else: only on integration branch(es) + allow failure
+ - if: $HELM_INTEG_VALUES && $CI_COMMIT_REF_NAME =~ $INTEG_REF
exists:
- "**/Chart.yaml"
allow_failure: true
@@ -607,8 +611,8 @@ helm-staging-score:
# exclude when $K8S_SCORE_DISABLED is set
- if: '$HELM_KUBE_SCORE_DISABLED == "true"'
when: never
- # else: allow failure
- - if: $HELM_STAGING_VALUES
+ # else: only on production branch(es) + allow failure
+ - if: $HELM_STAGING_VALUES && $CI_COMMIT_REF_NAME =~ $PROD_REF
exists:
- "**/Chart.yaml"
allow_failure: true
@@ -625,8 +629,8 @@ helm-prod-score:
# exclude when $K8S_SCORE_DISABLED is set
- if: '$HELM_KUBE_SCORE_DISABLED == "true"'
when: never
- # else: allow failure
- - if: $HELM_PROD_VALUES
+ # else: only on production branch(es) + allow failure
+ - if: $HELM_PROD_VALUES && $CI_COMMIT_REF_NAME =~ $PROD_REF
exists:
- "**/Chart.yaml"
allow_failure: true
--
GitLab