Commit 5cf126e1 authored by Pedro Eduardo Trujillo's avatar Pedro Eduardo Trujillo
Browse files

Merge branch 'dev' into 'master' 

Permite jobs de deploy para eventos de merge

See merge request redmic-project/gitlab-ci-templates!53
parents 92b06b08 1a36bc66

deployment-functional-unit.yml

+6 −7
Original line number Diff line number Diff line
@@ -13,12 +13,11 @@ include: 


.deploy-support-branch: &deploy-support-branch

  rules:

    - if: $CI_MERGE_REQUEST_ID ||

          $CI_COMMIT_TAG ||

    - if: $CI_COMMIT_TAG ||

          $CI_PIPELINE_SOURCE == "schedule" ||

          $CI_COMMIT_BRANCH == "master"

      when: never

    - if: $CI_COMMIT_BRANCH

    - if: $CI_COMMIT_BRANCH || $CI_MERGE_REQUEST_ID

      when: manual



deploy-commands-support-branch-development:
@@ -35,11 +34,10 @@ deploy-view-support-branch-development: 


.deploy-stable-branch: &deploy-stable-branch

  rules:

    - if: $CI_MERGE_REQUEST_ID ||

          $CI_COMMIT_TAG ||

    - if: $CI_COMMIT_TAG ||

          $CI_PIPELINE_SOURCE == "schedule"

      when: never

    - if: $CI_COMMIT_BRANCH == "master"

    - if: $CI_COMMIT_BRANCH == "master" || $CI_MERGE_REQUEST_ID

      when: manual



deploy-commands-stable-branch-development:
@@ -68,7 +66,8 @@ deploy-view-stable-branch-production: 


.deploy-tag: &deploy-tag

  rules:

    - if: $CI_COMMIT_TAG

    - if: $CI_COMMIT_TAG || $CI_MERGE_REQUEST_ID

      when: manual



deploy-commands-tag-development:

  extends: .deploy-commands-development

deployment.yml

+6 −7
Original line number Diff line number Diff line
@@ -3,12 +3,11 @@ include: 


.deploy-support-branch: &deploy-support-branch

  rules:

    - if: $CI_MERGE_REQUEST_ID ||

          $CI_COMMIT_TAG ||

    - if: $CI_COMMIT_TAG ||

          $CI_PIPELINE_SOURCE == "schedule" ||

          $CI_COMMIT_BRANCH == "master"

      when: never

    - if: $CI_COMMIT_BRANCH

    - if: $CI_COMMIT_BRANCH || $CI_MERGE_REQUEST_ID

      when: manual



deploy-support-branch-development:
@@ -17,11 +16,10 @@ deploy-support-branch-development: 


.deploy-stable-branch: &deploy-stable-branch

  rules:

    - if: $CI_MERGE_REQUEST_ID ||

          $CI_COMMIT_TAG ||

    - if: $CI_COMMIT_TAG ||

          $CI_PIPELINE_SOURCE == "schedule"

      when: never

    - if: $CI_COMMIT_BRANCH == "master"

    - if: $CI_COMMIT_BRANCH == "master" || $CI_MERGE_REQUEST_ID

      when: manual



deploy-stable-branch-development:
@@ -34,7 +32,8 @@ deploy-stable-branch-production: 


.deploy-tag: &deploy-tag

  rules:

    - if: $CI_COMMIT_TAG

    - if: $CI_COMMIT_TAG || $CI_MERGE_REQUEST_ID

      when: manual



deploy-tag-development:

  extends: .deploy-development