Commit aeccd784 authored by Pedro Eduardo Trujillo's avatar Pedro Eduardo Trujillo
Browse files

Merge branch 'dev' into 'master'

Dev

See merge request redmic-project/gitlab-ci-templates!40
parents 80d892ce 456e14de
Loading
Loading
Loading
Loading
+24 −29
Original line number Diff line number Diff line
@@ -5,21 +5,6 @@ include:
  variables:
    SERVICES_TO_CHECK: ${CI_PROJECT_NAME}_${CI_PROJECT_NAME}-${FUNCTIONAL_UNIT_MICROSERVICE_NAME}

.deploy-commands:
  extends: .deploy
  variables:
    FUNCTIONAL_UNIT_MICROSERVICE_NAME: commands
    STATUS_CHECK_DELAY: 300

.deploy-view:
  extends: .deploy
  variables:
    FUNCTIONAL_UNIT_MICROSERVICE_NAME: view

.deploy-microservice:
  environment: &deploy-microservice-environment
    url: https://${PUBLIC_HOSTNAME}/api/${CI_PROJECT_NAME}/${FUNCTIONAL_UNIT_MICROSERVICE_NAME}

.deploy-microservice-development:
  extends: .deploy-development
  variables:
@@ -28,7 +13,7 @@ include:
    DD_SPRING_PROFILES_ACTIVE: pre
  environment:
    name: dev/${CI_PROJECT_NAME}-${FUNCTIONAL_UNIT_MICROSERVICE_NAME}
    <<: *deploy-microservice-environment
    url: https://${DEV_PUBLIC_HOSTNAME}/api/${CI_PROJECT_NAME}/${FUNCTIONAL_UNIT_MICROSERVICE_NAME}

.deploy-microservice-production:
  extends: .deploy-production
@@ -38,24 +23,34 @@ include:
    DD_SPRING_PROFILES_ACTIVE: prod
  environment:
    name: pro/${CI_PROJECT_NAME}-${FUNCTIONAL_UNIT_MICROSERVICE_NAME}
    <<: *deploy-microservice-environment
    url: https://${PRO_PUBLIC_HOSTNAME}/api/${CI_PROJECT_NAME}/${FUNCTIONAL_UNIT_MICROSERVICE_NAME}

.deploy-commands:
  variables: &deploy-commands-variables
    FUNCTIONAL_UNIT_MICROSERVICE_NAME: commands
    STATUS_CHECK_DELAY: 300

.deploy-view:
  variables: &deploy-view-variables
    FUNCTIONAL_UNIT_MICROSERVICE_NAME: view
    STATUS_CHECK_DELAY: 180

.deploy-commands-development:
  extends:
    - .deploy-commands
    - .deploy-microservice-development
  extends: .deploy-microservice-development
  variables:
    <<: *deploy-commands-variables

.deploy-commands-production:
  extends:
    - .deploy-commands
    - .deploy-microservice-production
  extends: .deploy-microservice-production
  variables:
    <<: *deploy-commands-variables

.deploy-view-development:
  extends:
    - .deploy-view
    - .deploy-microservice-development
  extends: .deploy-microservice-development
  variables:
    <<: *deploy-view-variables

.deploy-view-production:
  extends:
    - .deploy-view
    - .deploy-microservice-production
  extends: .deploy-microservice-production
  variables:
    <<: *deploy-view-variables