Commit 2f02bcd4 authored by Pedro Eduardo Trujillo's avatar Pedro Eduardo Trujillo
Browse files

Merge branch 'dev' into 'master' 

Reunifica para evitar herencia duplicada

See merge request redmic-project/gitlab-ci-templates!28
parents ef45fe26 4ce7d017

_deployment-functional-unit.yml

+4 −0
Original line number Diff line number Diff line
@@ -7,9 +7,13 @@ include: 


.deploy-commands:

  extends: .deploy

  variables:

    FUNCTIONAL_UNIT_MICROSERVICE_NAME: commands



.deploy-view:

  extends: .deploy

  variables:

    FUNCTIONAL_UNIT_MICROSERVICE_NAME: view



.deploy-microservice-development:

  variables: &deploy-microservice-development-variables

deployment-functional-unit-view.yml

deleted100644 → 0
+0 −43
Original line number Diff line number Diff line 
include:

  - local: '/_deployment-functional-unit.yml'



variables:

  FUNCTIONAL_UNIT_MICROSERVICE_NAME: view



deploy-view-support-branch-development:

  extends: .deploy-view-development

  only:

    - branches

  except:

    - master

    - schedules



deploy-view-stable-branch-development:

  extends: .deploy-view-development

  only:

    - master

  except:

    - schedules



deploy-view-stable-branch-production:

  extends: .deploy-view-production

  only:

    - master

  except:

    - schedules



deploy-view-version-development:

  extends: .deploy-view-development

  only:

    - ${DEPLOY_VERSION_TAG_REGEX}

  except:

    - branches

    - schedules



deploy-view-version-production:

  extends: .deploy-view-production

  only:

    - ${DEPLOY_VERSION_TAG_REGEX}

  except:

    - branches

    - schedules

deployment-functional-unit-commands.yml→deployment-functional-unit.yml

+38 −3
Original line number Diff line number Diff line 
include:

  - local: '/_deployment-functional-unit.yml'



variables:

  FUNCTIONAL_UNIT_MICROSERVICE_NAME: commands



deploy-commands-support-branch-development:

  extends: .deploy-commands-development

  only:
@@ -41,3 +38,41 @@ deploy-commands-version-production: 
  except:

    - branches

    - schedules



deploy-view-support-branch-development:

  extends: .deploy-view-development

  only:

    - branches

  except:

    - master

    - schedules



deploy-view-stable-branch-development:

  extends: .deploy-view-development

  only:

    - master

  except:

    - schedules



deploy-view-stable-branch-production:

  extends: .deploy-view-production

  only:

    - master

  except:

    - schedules



deploy-view-version-development:

  extends: .deploy-view-development

  only:

    - ${DEPLOY_VERSION_TAG_REGEX}

  except:

    - branches

    - schedules



deploy-view-version-production:

  extends: .deploy-view-production

  only:

    - ${DEPLOY_VERSION_TAG_REGEX}

  except:

    - branches

    - schedules