Loading capif/templates/cd-deploy-ocf.gitlab-ci.yml +3 −8 Original line number Diff line number Diff line Loading @@ -28,13 +28,6 @@ variables: tags: - shell .staging_post_mr: &staging_post_mr tags: - shell rules: - if: '$CI_COMMIT_REF_NAME == "staging"' when: always .dev_common: &dev_common tags: - shell Loading Loading @@ -118,9 +111,11 @@ delete_ocf_staging: ### staging branch merged ### deploy_ocf_oficial_staging: stage: deploy_ocf_oficial_staging rules: - if: '$CI_COMMIT_REF_NAME == "staging"' when: always needs: - staging_build_and_push_mr <<: *staging_post_mr environment: name: review/oficial-staging url: https://capif-staging.$DOMAIN_STAGING Loading capif/templates/ci_staging.gitlab-ci.yml +9 −13 Original line number Diff line number Diff line Loading @@ -17,20 +17,14 @@ variables: CAPIF_DOCKER_REGISTRY: $CAPIF_DOCKER_REGISTRY .staging_common: &staging_common rules: - if: '$CI_PIPELINE_SOURCE == "merge_request_event" && $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "staging"' when: always tags: - shell .staging_mr: &staging_mr rules: - if: '$CI_PIPELINE_SOURCE == "push" && $CI_COMMIT_REF_NAME == "staging"' when: always only: - merge_requests except: variables: - $CI_MERGE_REQUEST_TARGET_BRANCH_NAME != "staging" tags: - shell .staging_dnd: &staging_dnd allow_failure: true rules: Loading Loading @@ -329,6 +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 script: - export TMP_PWD=$PWD - echo "TMP_PWD=$TMP_PWD" Loading Loading @@ -406,4 +403,3 @@ staging_build_and_push_mr: - docker push $CI_REGISTRY/ocf/capif/staging/helper:staging - echo "----------------------------------------------------" - docker logout $CI_REGISTRY No newline at end of file <<: *staging_mr No newline at end of file Loading
capif/templates/cd-deploy-ocf.gitlab-ci.yml +3 −8 Original line number Diff line number Diff line Loading @@ -28,13 +28,6 @@ variables: tags: - shell .staging_post_mr: &staging_post_mr tags: - shell rules: - if: '$CI_COMMIT_REF_NAME == "staging"' when: always .dev_common: &dev_common tags: - shell Loading Loading @@ -118,9 +111,11 @@ delete_ocf_staging: ### staging branch merged ### deploy_ocf_oficial_staging: stage: deploy_ocf_oficial_staging rules: - if: '$CI_COMMIT_REF_NAME == "staging"' when: always needs: - staging_build_and_push_mr <<: *staging_post_mr environment: name: review/oficial-staging url: https://capif-staging.$DOMAIN_STAGING Loading
capif/templates/ci_staging.gitlab-ci.yml +9 −13 Original line number Diff line number Diff line Loading @@ -17,20 +17,14 @@ variables: CAPIF_DOCKER_REGISTRY: $CAPIF_DOCKER_REGISTRY .staging_common: &staging_common rules: - if: '$CI_PIPELINE_SOURCE == "merge_request_event" && $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "staging"' when: always tags: - shell .staging_mr: &staging_mr rules: - if: '$CI_PIPELINE_SOURCE == "push" && $CI_COMMIT_REF_NAME == "staging"' when: always only: - merge_requests except: variables: - $CI_MERGE_REQUEST_TARGET_BRANCH_NAME != "staging" tags: - shell .staging_dnd: &staging_dnd allow_failure: true rules: Loading Loading @@ -329,6 +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 script: - export TMP_PWD=$PWD - echo "TMP_PWD=$TMP_PWD" Loading Loading @@ -406,4 +403,3 @@ staging_build_and_push_mr: - docker push $CI_REGISTRY/ocf/capif/staging/helper:staging - echo "----------------------------------------------------" - docker logout $CI_REGISTRY No newline at end of file <<: *staging_mr No newline at end of file