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

Merge branch 'feature-updateDeployment' into 'dev' 

Feature update deployment

See merge request redmic-project/gitlab-ci-templates!36
parents 27592701 9fb95297

_deployment-functional-unit.yml

+18 −15
Original line number Diff line number Diff line
@@ -3,56 +3,59 @@ include: 


.deploy:

  variables:

    SERVICES_TO_CHECK: ${STACK}_${CI_PROJECT_NAME}-${FUNCTIONAL_UNIT_MICROSERVICE_NAME}

    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: &deploy-microservice-development-variables

    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}

    <<: *deploy-microservice-environment



.deploy-microservice-production:

  extends: .deploy-production

  variables: &deploy-microservice-production-variables

    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}

    <<: *deploy-microservice-environment



.deploy-view-development:

  extends: .deploy-view

.deploy-commands-development:

  extends: .deploy-commands

  variables: *deploy-microservice-development-variables

  environment: *deploy-microservice-development-environment



.deploy-view-production:

  extends: .deploy-view

.deploy-commands-production:

  extends: .deploy-commands

  variables: *deploy-microservice-production-variables

  environment: *deploy-microservice-production-environment



.deploy-commands-development:

  extends: .deploy-commands

.deploy-view-development:

  extends: .deploy-view

  variables: *deploy-microservice-development-variables

  environment: *deploy-microservice-development-environment



.deploy-commands-production:

  extends: .deploy-commands

.deploy-view-production:

  extends: .deploy-view

  variables: *deploy-microservice-production-variables

  environment: *deploy-microservice-production-environment

_deployment.yml

+18 −17
Original line number Diff line number Diff line 
.deploy:

  stage: deploy

  dependencies: []

  image: ${DOCKER_DEPLOY_IMAGE_NAME}:${DOCKER_DEPLOY_IMAGE_TAG}

  variables:

  DEPLOYMENT_IMAGE: ${DOCKER_DEPLOY_IMAGE_NAME}:${DOCKER_DEPLOY_IMAGE_TAG}

  STACK: stack

    DOCKER_DEPLOY_IMAGE_NAME: redmic/docker-docker-deploy

    DOCKER_DEPLOY_IMAGE_TAG: latest

    STACK: ${CI_PROJECT_NAME}

    REGISTRY_URL: ${CI_REGISTRY}

    REGISTRY_USER: ${CI_DEPLOY_USER}

    REGISTRY_PASS: ${CI_DEPLOY_PASSWORD}

    SERVICES_TO_CHECK: ${CI_PROJECT_NAME}_${CI_PROJECT_NAME}

    STATUS_CHECK_RETRIES: 10

    STATUS_CHECK_INTERVAL: 20

    STATUS_CHECK_DELAY: 120

    STATUS_CHECK_MIN_HITS: 3

  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

  dependencies: []

  script: deploy

  when: manual



.deploy-development:

  extends: .deploy

  variables:

    SSH_REMOTE: ${DEV_SSH_REMOTE}

    SSH_PORT: ${DEV_SSH_PORT}

    DEPLOY_KEY: ${DEV_DEPLOY_KEY}

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

    PUBLIC_HOSTNAME: ${DEV_PUBLIC_HOSTNAME}

    DD_PUBLIC_HOSTNAME: ${DEV_PUBLIC_HOSTNAME}
@@ -34,6 +33,8 @@ variables: 
  extends: .deploy

  variables:

    SSH_REMOTE: ${PRO_SSH_REMOTE}

    SSH_PORT: ${PRO_SSH_PORT}

    DEPLOY_KEY: ${PRO_DEPLOY_KEY}

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

    PUBLIC_HOSTNAME: ${PRO_PUBLIC_HOSTNAME}

    DD_PUBLIC_HOSTNAME: ${PRO_PUBLIC_HOSTNAME}

deployment-custom-image.yml

0 → 100644
+29 −0
Original line number Diff line number Diff line 
.deploy-branch-base:

  variables: &deploy-branch-base-variables

    DD_IMAGE_NAME: ${CI_REGISTRY_IMAGE}

    DD_IMAGE_TAG: ${CI_COMMIT_SHA}



.deploy-tag-base:

  variables: &deploy-tag-base-variables

    DD_IMAGE_NAME: ${CI_REGISTRY_IMAGE}

    DD_IMAGE_TAG: ${CI_COMMIT_TAG}



deploy-support-branch-development:

  variables:

    <<: *deploy-branch-base-variables



deploy-stable-branch-development:

  variables:

    <<: *deploy-branch-base-variables



deploy-stable-branch-production:

  variables:

    <<: *deploy-branch-base-variables



deploy-tag-development:

  variables:

    <<: *deploy-tag-base-variables



deploy-tag-production:

  variables:

    <<: *deploy-tag-base-variables

deployment-functional-unit.yml

+59 −36
Original line number Diff line number Diff line 
include:

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



deploy-commands-support-branch-development:

  extends: .deploy-commands-development

.deploy-branch-base:

  variables: &deploy-branch-base-variables

    DD_IMAGE_NAME: ${CI_REGISTRY_IMAGE}

    DD_IMAGE_TAG: ${CI_COMMIT_SHA}



.deploy-tag-base:

  variables: &deploy-tag-base-variables

    DD_IMAGE_NAME: ${CI_REGISTRY_IMAGE}

    DD_IMAGE_TAG: ${CI_COMMIT_TAG}



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

  only:

    - branches

  except:

    - master

    - schedules



deploy-commands-stable-branch-development:

deploy-commands-support-branch-development:

  extends: .deploy-commands-development

  only:

    - master

  except:

    - schedules

  variables:

    <<: *deploy-branch-base-variables

  <<: *deploy-support-branch



deploy-commands-stable-branch-production:

  extends: .deploy-commands-production

deploy-view-support-branch-development:

  extends: .deploy-view-development

  variables:

    <<: *deploy-branch-base-variables

  <<: *deploy-support-branch



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

  only:

    - master

  except:

    - schedules



deploy-commands-version-development:

deploy-commands-stable-branch-development:

  extends: .deploy-commands-development

  only:

    - tags

  variables:

    <<: *deploy-branch-base-variables

  <<: *deploy-stable-branch



deploy-commands-version-production:

deploy-commands-stable-branch-production:

  extends: .deploy-commands-production

  only:

    - tags



deploy-view-support-branch-development:

  extends: .deploy-view-development

  only:

    - branches

  except:

    - master

    - schedules

  variables:

    <<: *deploy-branch-base-variables

  <<: *deploy-stable-branch



deploy-view-stable-branch-development:

  extends: .deploy-view-development

  only:

    - master

  except:

    - schedules

  variables:

    <<: *deploy-branch-base-variables

  <<: *deploy-stable-branch



deploy-view-stable-branch-production:

  extends: .deploy-view-production

  only:

    - master

  except:

    - schedules

  variables:

    <<: *deploy-branch-base-variables

  <<: *deploy-stable-branch



deploy-view-version-development:

  extends: .deploy-view-development

.deploy-tag: &deploy-tag

  only:

    - tags



deploy-view-version-production:

deploy-commands-tag-development:

  extends: .deploy-commands-development

  variables:

    <<: *deploy-tag-base-variables

  <<: *deploy-tag



deploy-commands-tag-production:

  extends: .deploy-commands-production

  variables:

    <<: *deploy-tag-base-variables

  <<: *deploy-tag



deploy-view-tag-development:

  extends: .deploy-view-development

  variables:

    <<: *deploy-tag-base-variables

  <<: *deploy-tag



deploy-view-tag-production:

  extends: .deploy-view-production

  only:

    - tags
 
  variables:

    <<: *deploy-tag-base-variables

  <<: *deploy-tag

deployment.yml

+17 −12
Original line number Diff line number Diff line 
include:

  - local: '/_deployment.yml'



deploy-support-branch-development:

  extends: .deploy-development

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

  only:

    - branches

  except:

    - master

    - schedules



deploy-stable-branch-development:

deploy-support-branch-development:

  extends: .deploy-development

  <<: *deploy-support-branch



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

  only:

    - master

  except:

    - schedules



deploy-stable-branch-development:

  extends: .deploy-development

  <<: *deploy-stable-branch



deploy-stable-branch-production:

  extends: .deploy-production

  only:

    - master

  except:

    - schedules

  <<: *deploy-stable-branch



deploy-version-development:

  extends: .deploy-development

.deploy-tag: &deploy-tag

  only:

    - tags



deploy-version-production:

deploy-tag-development:

  extends: .deploy-development

  <<: *deploy-tag



deploy-tag-production:

  extends: .deploy-production

  only:

    - tags
 
  <<: *deploy-tag