Loading capif/templates/cd-deploy-ocf.gitlab-ci.yml +4 −3 Original line number Diff line number Diff line Loading @@ -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: Loading capif/templates/ci_staging.gitlab-ci.yml +5 −4 Original line number Diff line number Diff line Loading @@ -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" Loading Loading @@ -403,3 +403,4 @@ staging_build_and_push_mr: - docker push $CI_REGISTRY/ocf/capif/staging/helper:staging - echo "----------------------------------------------------" - docker logout $CI_REGISTRY <<: *staging_common No newline at end of file Loading
capif/templates/cd-deploy-ocf.gitlab-ci.yml +4 −3 Original line number Diff line number Diff line Loading @@ -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: Loading
capif/templates/ci_staging.gitlab-ci.yml +5 −4 Original line number Diff line number Diff line Loading @@ -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" Loading Loading @@ -403,3 +403,4 @@ staging_build_and_push_mr: - docker push $CI_REGISTRY/ocf/capif/staging/helper:staging - echo "----------------------------------------------------" - docker logout $CI_REGISTRY <<: *staging_common No newline at end of file