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

Merge branch 'dev' into 'master' 

Reorganiza y corrige deploy de functional units

See merge request redmic-project/gitlab-ci-templates!27
parents 3168c8e6 f5a5d57e

deployment-functional-unit.yml→_deployment-functional-unit.yml

+50 −0
Original line number Diff line number Diff line
@@ -5,16 +5,46 @@ include: 
  variables:

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



.deploy-development:

  variables:

.deploy-commands:

  extends: .deploy



.deploy-view:

  extends: .deploy



.deploy-microservice-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}

    SPRING_PROFILES_ACTIVE: pre

  environment:

  environment: &deploy-microservice-development-environment

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



.deploy-production:

  variables:

.deploy-microservice-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}

    SPRING_PROFILES_ACTIVE: prod

  environment:

  environment: &deploy-microservice-production-environment

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



.deploy-view-development:

  extends: .deploy-view

  variables: *deploy-microservice-development-variables

  environment: *deploy-microservice-development-environment



.deploy-view-production:

  extends: .deploy-view

  variables: *deploy-microservice-production-variables

  environment: *deploy-microservice-production-environment



.deploy-commands-development:

  extends: .deploy-commands

  variables: *deploy-microservice-development-variables

  environment: *deploy-microservice-development-environment



.deploy-commands-production:

  extends: .deploy-commands

  variables: *deploy-microservice-production-variables

  environment: *deploy-microservice-production-environment

deployment-functional-unit-commands.yml

+6 −6
Original line number Diff line number Diff line 
include:

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

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



variables:

  FUNCTIONAL_UNIT_MICROSERVICE_NAME: commands



deploy-commands-support-branch-development:

  extends: .deploy-development

  extends: .deploy-commands-development

  only:

    - branches

  except:
@@ -13,21 +13,21 @@ deploy-commands-support-branch-development: 
    - schedules



deploy-commands-stable-branch-development:

  extends: .deploy-development

  extends: .deploy-commands-development

  only:

    - master

  except:

    - schedules



deploy-commands-stable-branch-production:

  extends: .deploy-production

  extends: .deploy-commands-production

  only:

    - master

  except:

    - schedules



deploy-commands-version-development:

  extends: .deploy-development

  extends: .deploy-commands-development

  only:

    - ${DEPLOY_VERSION_TAG_REGEX}

  except:
@@ -35,7 +35,7 @@ deploy-commands-version-development: 
    - schedules



deploy-commands-version-production:

  extends: .deploy-production

  extends: .deploy-commands-production

  only:

    - ${DEPLOY_VERSION_TAG_REGEX}

  except:

deployment-functional-unit-view.yml

+7 −7
Original line number Diff line number Diff line 
include:

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

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



variables:

  FUNCTIONAL_UNIT_MICROSERVICE_NAME: commands

  FUNCTIONAL_UNIT_MICROSERVICE_NAME: view



deploy-view-support-branch-development:

  extends: .deploy-development

  extends: .deploy-view-development

  only:

    - branches

  except:
@@ -13,21 +13,21 @@ deploy-view-support-branch-development: 
    - schedules



deploy-view-stable-branch-development:

  extends: .deploy-development

  extends: .deploy-view-development

  only:

    - master

  except:

    - schedules



deploy-view-stable-branch-production:

  extends: .deploy-production

  extends: .deploy-view-production

  only:

    - master

  except:

    - schedules



deploy-view-version-development:

  extends: .deploy-development

  extends: .deploy-view-development

  only:

    - ${DEPLOY_VERSION_TAG_REGEX}

  except:
@@ -35,7 +35,7 @@ deploy-view-version-development: 
    - schedules



deploy-view-version-production:

  extends: .deploy-production

  extends: .deploy-view-production

  only:

    - ${DEPLOY_VERSION_TAG_REGEX}

  except: