Commit 92b06b08 authored by Pedro Eduardo Trujillo's avatar Pedro Eduardo Trujillo
Browse files

Merge branch 'dev' into 'master' 

Corrige jobs manuales de despliegue

See merge request redmic-project/gitlab-ci-templates!52
parents 660afe05 c9877701

_deployment.yml

+0 −1
Original line number Diff line number Diff line
@@ -15,7 +15,6 @@ 
    STATUS_CHECK_DELAY: 120

    STATUS_CHECK_MIN_HITS: 3

  script: deploy

  when: manual



.deploy-development:

  extends: .deploy

deployment-functional-unit.yml

+2 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ include: 
          $CI_COMMIT_BRANCH == "master"

      when: never

    - if: $CI_COMMIT_BRANCH

      when: manual



deploy-commands-support-branch-development:

  extends: .deploy-commands-development
@@ -39,6 +40,7 @@ deploy-view-support-branch-development: 
          $CI_PIPELINE_SOURCE == "schedule"

      when: never

    - if: $CI_COMMIT_BRANCH == "master"

      when: manual



deploy-commands-stable-branch-development:

  extends: .deploy-commands-development

deployment.yml

+2 −0
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ include: 
          $CI_COMMIT_BRANCH == "master"

      when: never

    - if: $CI_COMMIT_BRANCH

      when: manual



deploy-support-branch-development:

  extends: .deploy-development
@@ -21,6 +22,7 @@ deploy-support-branch-development: 
          $CI_PIPELINE_SOURCE == "schedule"

      when: never

    - if: $CI_COMMIT_BRANCH == "master"

      when: manual



deploy-stable-branch-development:

  extends: .deploy-development