From d3d339836c3bb571f2704f332d7ef589f54da616 Mon Sep 17 00:00:00 2001
From: Pierre Smeyers <pierre.smeyers@gmail.com>
Date: Sun, 1 May 2022 14:14:44 +0200
Subject: [PATCH] chore: use workflow rules
---
templates/gitlab-ci-docker.yml | 29 ++++++++---------------------
1 file changed, 8 insertions(+), 21 deletions(-)
diff --git a/templates/gitlab-ci-docker.yml b/templates/gitlab-ci-docker.yml
index e7115ea..82c865d 100644
--- a/templates/gitlab-ci-docker.yml
+++ b/templates/gitlab-ci-docker.yml
@@ -13,6 +13,14 @@
# program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth
# Floor, Boston, MA 02110-1301, USA.
# =========================================================================================
+# default workflow rules
+workflow:
+ rules:
+ # exclude merge requests
+ - if: $CI_MERGE_REQUEST_ID
+ when: never
+ - when: always
+
variables:
# variabilized tracking image
TBC_TRACKING_IMAGE: "$CI_REGISTRY/to-be-continuous/tools/tracking:master"
@@ -422,9 +430,6 @@ docker-lint:
script:
- dockerfile_lint -f $DOCKER_FILE $DOCKER_LINT_ARGS
rules:
- # exclude merge requests
- - if: $CI_MERGE_REQUEST_ID
- when: never
# execute if DOCKER_LINT_ENABLED set
# on production or integration branches:
- if: '$DOCKER_LINT_ENABLED == "true" && ($CI_COMMIT_REF_NAME =~ $PROD_REF || $CI_COMMIT_REF_NAME =~ $INTEG_REF)'
@@ -460,9 +465,6 @@ docker-hadolint:
paths:
- "reports/hadolint-*.json"
rules:
- # exclude merge requests
- - if: $CI_MERGE_REQUEST_ID
- when: never
# exclude if DOCKER_HADOLINT_DISABLED set
- if: '$DOCKER_HADOLINT_DISABLED == "true"'
when: never
@@ -495,9 +497,6 @@ docker-kaniko-build:
dotenv:
- docker.env
rules:
- # exclude merge requests
- - if: $CI_MERGE_REQUEST_ID
- when: never
# execute if $DOCKER_DIND_BUILD not set
- if: '$DOCKER_DIND_BUILD == null || $DOCKER_DIND_BUILD == ""'
@@ -528,9 +527,6 @@ docker-dind-build:
dotenv:
- docker.env
rules:
- # exclude merge requests
- - if: $CI_MERGE_REQUEST_ID
- when: never
- if: $DOCKER_DIND_BUILD
# ==================================================
@@ -595,9 +591,6 @@ docker-healthcheck:
exit 1
fi
rules:
- # exclude merge requests
- - if: $CI_MERGE_REQUEST_ID
- when: never
- if: '$DOCKER_HEALTHCHECK_DISABLED == "true"'
when: never
- if: $DOCKER_DIND_BUILD
@@ -628,9 +621,6 @@ docker-trivy:
reports:
junit: "trivy/*.xml"
rules:
- # exclude merge requests
- - if: $CI_MERGE_REQUEST_ID
- when: never
- if: '$DOCKER_TRIVY_DISABLED == "true"'
when: never
- if: '$DOCKER_TRIVY_ADDR && ($CI_COMMIT_REF_NAME =~ $PROD_REF || $CI_COMMIT_REF_NAME =~ $INTEG_REF)'
@@ -676,9 +666,6 @@ docker-publish:
dotenv:
- docker.env
rules:
- # exclude merge requests
- - if: $CI_MERGE_REQUEST_ID
- when: never
# on tag: always
- if: $CI_COMMIT_TAG
# exclude non-production branches
--
GitLab