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

Merge branch 'dev' into 'master' 

Define variables con prefijo de paso a despliegue

See merge request redmic-project/gitlab-ci-templates!35
parents e5a34c60 27592701

_deployment-functional-unit.yml

+4 −0
Original line number Diff line number Diff line
@@ -20,7 +20,9 @@ include: 
    SSH_REMOTE: ${DEV_SSH_REMOTE}

    COMPOSE_FILE: docker-compose.${CI_PROJECT_NAME}-${FUNCTIONAL_UNIT_MICROSERVICE_NAME}.tmpl.yml:docker-compose.${CI_PROJECT_NAME}-${FUNCTIONAL_UNIT_MICROSERVICE_NAME}.dev.yml

    PUBLIC_HOSTNAME: ${DEV_PUBLIC_HOSTNAME}

    DD_PUBLIC_HOSTNAME: ${DEV_PUBLIC_HOSTNAME}

    SPRING_PROFILES_ACTIVE: pre

    DD_SPRING_PROFILES_ACTIVE: pre

  environment: &deploy-microservice-development-environment

    name: dev/${CI_PROJECT_NAME}-${FUNCTIONAL_UNIT_MICROSERVICE_NAME}
@@ -29,7 +31,9 @@ include: 
    SSH_REMOTE: ${PRO_SSH_REMOTE}

    COMPOSE_FILE: docker-compose.${CI_PROJECT_NAME}-${FUNCTIONAL_UNIT_MICROSERVICE_NAME}.tmpl.yml:docker-compose.${CI_PROJECT_NAME}-${FUNCTIONAL_UNIT_MICROSERVICE_NAME}.prod.yml

    PUBLIC_HOSTNAME: ${PRO_PUBLIC_HOSTNAME}

    DD_PUBLIC_HOSTNAME: ${PRO_PUBLIC_HOSTNAME}

    SPRING_PROFILES_ACTIVE: prod

    DD_SPRING_PROFILES_ACTIVE: prod

  environment: &deploy-microservice-production-environment

    name: pro/${CI_PROJECT_NAME}-${FUNCTIONAL_UNIT_MICROSERVICE_NAME}

_deployment.yml

+5 −4
Original line number Diff line number Diff line
@@ -8,16 +8,15 @@ variables: 
  STATUS_CHECK_INTERVAL: 20

  STATUS_CHECK_DELAY: 120

  STATUS_CHECK_MIN_HITS: 3

  IMAGE_NAME: ${CI_REGISTRY_IMAGE}

  IMAGE_TAG: ${CI_COMMIT_SHA}

  DD_IMAGE_NAME: ${CI_REGISTRY_IMAGE}

  DD_IMAGE_TAG: ${CI_COMMIT_SHA}



.deploy:

  stage: deploy

  image: ${DEPLOYMENT_IMAGE}

  variables:

    SERVICES_TO_CHECK: ${STACK}_${CI_PROJECT_NAME}

  script:

    - deploy.sh IMAGE_NAME=${IMAGE_NAME} IMAGE_TAG=${IMAGE_TAG}

  script: deploy.sh

  dependencies: []

  when: manual
@@ -27,6 +26,7 @@ variables: 
    SSH_REMOTE: ${DEV_SSH_REMOTE}

    COMPOSE_FILE: docker-compose.tmpl.yml:docker-compose.dev.yml

    PUBLIC_HOSTNAME: ${DEV_PUBLIC_HOSTNAME}

    DD_PUBLIC_HOSTNAME: ${DEV_PUBLIC_HOSTNAME}

  environment:

    name: dev
@@ -36,5 +36,6 @@ variables: 
    SSH_REMOTE: ${PRO_SSH_REMOTE}

    COMPOSE_FILE: docker-compose.tmpl.yml:docker-compose.prod.yml

    PUBLIC_HOSTNAME: ${PRO_PUBLIC_HOSTNAME}

    DD_PUBLIC_HOSTNAME: ${PRO_PUBLIC_HOSTNAME}

  environment:

    name: pro