diff --git a/capif/templates/ci_staging.gitlab-ci.yml b/capif/templates/ci_staging.gitlab-ci.yml index 4bedac95770c362a3143b01762ed7e9c781402bf..b6d15c6ff03ca55068359a905f04dce10b71273b 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