From d4d63f8c720a95623e10a5a648bfbafe0f8f5521 Mon Sep 17 00:00:00 2001
From: Diego MENDEZ <Diego.MENDEZ@ext.ec.europa.eu>
Date: Fri, 8 Nov 2024 17:42:12 +0200
Subject: [PATCH] removing some duplicated code.
---
.gitlab-ci.yml | 28 +++++++++-------------------
1 file changed, 9 insertions(+), 19 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1146c94..ba7a52c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -49,32 +49,22 @@ run-test:
# Create 'resource_group', to avoid collision when executing many pipelines at the same time.
resource_group: test-group
-deliver-latest-job:
+deliver-image-job:
stage: deliver
variables:
- IMAGE_TAG: "latest"
+ IMAGE_TAG: "testing-${CI_COMMIT_BRANCH}"
script:
- ansible-playbook ansible/deliver.yml
rules:
+ # deliver latest
- if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
-
-deliver-tagged-job:
- stage: deliver
- variables:
- IMAGE_TAG: $CI_COMMIT_TAG
- script:
- - ansible-playbook ansible/deliver.yml
- rules:
+ variables: # Override IMAGE_TAG variable
+ IMAGE_TAG: "latest"
+ # deliver tagged image
- if: $CI_COMMIT_TAG
-
-deliver-testing-branch-job:
- stage: deliver
- variables:
- IMAGE_TAG: "testing-${CI_COMMIT_BRANCH}"
- script:
- - ansible-playbook ansible/deliver.yml
- rules:
- # For custom Testing images, keep standard, naming your branch as v4.1someSquadNameRef
+ variables: # Override IMAGE_TAG variable
+ IMAGE_TAG: $CI_COMMIT_TAG
+ # For custom Testing images, keep standard, naming your branch as v4.1-someSquadNameRef
- if: $CI_COMMIT_BRANCH == 'develop'
- if: $CI_COMMIT_BRANCH =~ /^v3*/
- if: $CI_COMMIT_BRANCH =~ /^v4*/
--
GitLab