staging_post_mr

capif/templates/cd-deploy-ocf.gitlab-ci.yml

@@ -33,6 +33,7 @@ variables:
     - shell
   rules:
     - if: '$CI_COMMIT_REF_NAME == "staging"'
+      when: always
 
 .dev_common: &dev_common
   tags:
@@ -119,7 +120,7 @@ deploy_ocf_oficial_staging:
   stage: deploy_ocf_oficial_staging
   needs:
     - staging_build_and_push_mr
-  <<: *staging_common
+  <<: *staging_post_mr
   environment:
     name: review/oficial-staging
     url: https://capif-staging.$DOMAIN_STAGING

capif/templates/ci_staging.gitlab-ci.yml

@@ -19,12 +19,14 @@ variables:
 .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
   tags:
     - shell
 
@@ -40,12 +42,6 @@ variables:
   tags:
     - docker-in-docker
 
-#staging_pulling_repo:
-#  stage: staging_pulling_repo
-#  script:
-#    - git clone https://oauth2:${CI_JOB_TOKEN}@labs.etsi.org/rep/ocf/capif.git
-#  <<: *staging_common
-
 #staging_cancel_previous_action:
 #  stage: staging_pre_pipeline
 #  script: