Commit 275c6f21 authored by Pedro Eduardo Trujillo's avatar Pedro Eduardo Trujillo
Browse files

Deshace jobs para eventos de merge 

Pero continua definiendo como manual los deploy por evento de tag
(introducido en el commit anterior).
parent 1a36bc66

deployment-functional-unit.yml

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


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

  rules:

    - if: $CI_COMMIT_TAG ||

    - if: $CI_MERGE_REQUEST_ID ||

          $CI_COMMIT_TAG ||

          $CI_PIPELINE_SOURCE == "schedule" ||

          $CI_COMMIT_BRANCH == "master"

      when: never

    - if: $CI_COMMIT_BRANCH || $CI_MERGE_REQUEST_ID

    - if: $CI_COMMIT_BRANCH

      when: manual



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


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

  rules:

    - if: $CI_COMMIT_TAG ||

    - if: $CI_MERGE_REQUEST_ID ||

          $CI_COMMIT_TAG ||

          $CI_PIPELINE_SOURCE == "schedule"

      when: never

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

    - if: $CI_COMMIT_BRANCH == "master"

      when: manual



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


.deploy-tag: &deploy-tag

  rules:

    - if: $CI_COMMIT_TAG || $CI_MERGE_REQUEST_ID

    - if: $CI_COMMIT_TAG

      when: manual



deploy-commands-tag-development:

deployment.yml

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


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

  rules:

    - if: $CI_COMMIT_TAG ||

    - if: $CI_MERGE_REQUEST_ID ||

          $CI_COMMIT_TAG ||

          $CI_PIPELINE_SOURCE == "schedule" ||

          $CI_COMMIT_BRANCH == "master"

      when: never

    - if: $CI_COMMIT_BRANCH || $CI_MERGE_REQUEST_ID

    - if: $CI_COMMIT_BRANCH

      when: manual



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


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

  rules:

    - if: $CI_COMMIT_TAG ||

    - if: $CI_MERGE_REQUEST_ID ||

          $CI_COMMIT_TAG ||

          $CI_PIPELINE_SOURCE == "schedule"

      when: never

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

    - if: $CI_COMMIT_BRANCH == "master"

      when: manual



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


.deploy-tag: &deploy-tag

  rules:

    - if: $CI_COMMIT_TAG || $CI_MERGE_REQUEST_ID

    - if: $CI_COMMIT_TAG

      when: manual



deploy-tag-development: