From e11bf42d60eb6071da30bbace64fd51b212b923d Mon Sep 17 00:00:00 2001
From: andresanaya21 <alvaroandres.anayaamariles@telefonica.com>
Date: Tue, 4 Jun 2024 15:48:03 +0200
Subject: [PATCH] staging_build_and_push_mr
---
capif/templates/ci_staging.gitlab-ci.yml | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/capif/templates/ci_staging.gitlab-ci.yml b/capif/templates/ci_staging.gitlab-ci.yml
index 4bedac9..b6d15c6 100644
--- a/capif/templates/ci_staging.gitlab-ci.yml
+++ b/capif/templates/ci_staging.gitlab-ci.yml
@@ -323,9 +323,10 @@ staging_build_and_push:
### staging branch merged ###
staging_build_and_push_mr:
stage: staging_build_and_push_mr
-# rules:
-# - if: '$CI_PIPELINE_SOURCE == "push" && $CI_COMMIT_REF_NAME == "staging"'
-# when: always
+# <<: *staging_common
+ rules:
+ - if: '$CI_PIPELINE_SOURCE == "push" && $CI_COMMIT_REF_NAME == "staging"'
+ when: always
script:
- export TMP_PWD=$PWD
- echo "TMP_PWD=$TMP_PWD"
@@ -402,5 +403,4 @@ staging_build_and_push_mr:
- docker build -t $CI_REGISTRY/ocf/capif/staging/helper:staging .
- docker push $CI_REGISTRY/ocf/capif/staging/helper:staging
- echo "----------------------------------------------------"
- - docker logout $CI_REGISTRY
- <<: *staging_common
\ No newline at end of file
+ - docker logout $CI_REGISTRY
\ No newline at end of file
--
GitLab