diff --git a/capif/templates/cd-deploy-ocf.gitlab-ci.yml b/capif/templates/cd-deploy-ocf.gitlab-ci.yml index 550f80b105cf761957f602cdeaa7f220e1921fc6..6f54b479fb09c8c85594a8a6fc4437fd3cb3791b 100644 --- a/capif/templates/cd-deploy-ocf.gitlab-ci.yml +++ b/capif/templates/cd-deploy-ocf.gitlab-ci.yml @@ -111,9 +111,10 @@ delete_ocf_staging: ### staging branch merged ### deploy_ocf_oficial_staging: stage: deploy_ocf_oficial_staging - rules: - - if: '$CI_COMMIT_REF_NAME == "staging"' - when: always + <<: *staging_common +# rules: +# - if: '$CI_COMMIT_REF_NAME == "staging"' +# when: always needs: - staging_build_and_push_mr environment: diff --git a/capif/templates/ci_staging.gitlab-ci.yml b/capif/templates/ci_staging.gitlab-ci.yml index c15dd55c0ca40034ef870b1666642a6660f41a34..4bedac95770c362a3143b01762ed7e9c781402bf 100644 --- a/capif/templates/ci_staging.gitlab-ci.yml +++ b/capif/templates/ci_staging.gitlab-ci.yml @@ -323,9 +323,9 @@ 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 +# rules: +# - if: '$CI_PIPELINE_SOURCE == "push" && $CI_COMMIT_REF_NAME == "staging"' +# when: always script: - export TMP_PWD=$PWD - echo "TMP_PWD=$TMP_PWD" @@ -402,4 +402,5 @@ 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 \ No newline at end of file + - docker logout $CI_REGISTRY + <<: *staging_common \ No newline at end of file