Commit 08acf068 authored by Pedro Eduardo Trujillo's avatar Pedro Eduardo Trujillo
Browse files

Merge branch 'dev' into 'master' 

Habilita despliegues para cualquier tag

See merge request redmic-project/gitlab-ci-templates!32
parents ed978a5f 3f204249

_deployment.yml

+0 −1
Original line number Diff line number Diff line 
variables:

  DEPLOYMENT_IMAGE: ${DOCKER_DEPLOY_IMAGE_NAME}:${DOCKER_DEPLOY_IMAGE_TAG}

  DEPLOY_VERSION_TAG_REGEX: /^v\d+\.\d+\.\d+$$/

  STACK: stack

  REGISTRY_URL: ${CI_REGISTRY}

  REGISTRY_USER: ${CI_DEPLOY_USER}

deployment-functional-unit.yml

+4 −16
Original line number Diff line number Diff line
@@ -26,18 +26,12 @@ deploy-commands-stable-branch-production: 
deploy-commands-version-development:

  extends: .deploy-commands-development

  only:

    - ${DEPLOY_VERSION_TAG_REGEX}

  except:

    - branches

    - schedules

    - tags



deploy-commands-version-production:

  extends: .deploy-commands-production

  only:

    - ${DEPLOY_VERSION_TAG_REGEX}

  except:

    - branches

    - schedules

    - tags



deploy-view-support-branch-development:

  extends: .deploy-view-development
@@ -64,15 +58,9 @@ deploy-view-stable-branch-production: 
deploy-view-version-development:

  extends: .deploy-view-development

  only:

    - ${DEPLOY_VERSION_TAG_REGEX}

  except:

    - branches

    - schedules

    - tags



deploy-view-version-production:

  extends: .deploy-view-production

  only:

    - ${DEPLOY_VERSION_TAG_REGEX}

  except:

    - branches

    - schedules
 
    - tags

deployment.yml

+2 −8
Original line number Diff line number Diff line
@@ -26,15 +26,9 @@ deploy-stable-branch-production: 
deploy-version-development:

  extends: .deploy-development

  only:

    - ${DEPLOY_VERSION_TAG_REGEX}

  except:

    - branches

    - schedules

    - tags



deploy-version-production:

  extends: .deploy-production

  only:

    - ${DEPLOY_VERSION_TAG_REGEX}

  except:

    - branches

    - schedules
 
    - tags