diff options
| author | James Keogh <james.keogh@cambridgeconsultants.com> | 2019-07-23 21:32:10 +0000 |
|---|---|---|
| committer | Thong Kuah <tkuah@gitlab.com> | 2019-07-23 21:32:10 +0000 |
| commit | a71da850d93c0fc7cef60ff0fbc8661ba7008911 (patch) | |
| tree | b9f00e0a9f73c541403a605097b09b2a75790ffe /lib | |
| parent | 9e01240ff18f7c516fc147108962256cea20d294 (diff) | |
| download | gitlab-ce-a71da850d93c0fc7cef60ff0fbc8661ba7008911.tar.gz | |
Rename changelog to correct issue number, be more explicit that we're talking about Auto DevOps projects
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/gitlab/ci/templates/Jobs/Deploy.gitlab-ci.yml | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/lib/gitlab/ci/templates/Jobs/Deploy.gitlab-ci.yml b/lib/gitlab/ci/templates/Jobs/Deploy.gitlab-ci.yml index 108f0119ae1..6ead127e7b6 100644 --- a/lib/gitlab/ci/templates/Jobs/Deploy.gitlab-ci.yml +++ b/lib/gitlab/ci/templates/Jobs/Deploy.gitlab-ci.yml @@ -243,7 +243,8 @@ rollout 100%: .deploy_helpers: &deploy_helpers | [[ "$TRACE" ]] && set -x - auto_database_url=postgres://${POSTGRES_USER}:${POSTGRES_PASSWORD}@${CI_ENVIRONMENT_SLUG}-postgres:5432/${POSTGRES_DB} + export RELEASE_NAME=${HELM_RELEASE_NAME:-$CI_ENVIRONMENT_SLUG} + auto_database_url=postgres://${POSTGRES_USER}:${POSTGRES_PASSWORD}@${RELEASE_NAME}-postgres:5432/${POSTGRES_DB} export DATABASE_URL=${DATABASE_URL-$auto_database_url} export TILLER_NAMESPACE=$KUBE_NAMESPACE @@ -307,7 +308,7 @@ rollout 100%: } function deploy_name() { - name="$CI_ENVIRONMENT_SLUG" + name="$RELEASE_NAME" track="${1-stable}" if [[ "$track" != "stable" ]]; then @@ -372,7 +373,7 @@ rollout 100%: --set service.enabled="$service_enabled" \ --set gitlab.app="$CI_PROJECT_PATH_SLUG" \ --set gitlab.env="$CI_ENVIRONMENT_SLUG" \ - --set releaseOverride="$CI_ENVIRONMENT_SLUG" \ + --set releaseOverride="$RELEASE_NAME" \ --set image.repository="$image_repository" \ --set image.tag="$image_tag" \ --set image.pullPolicy=IfNotPresent \ @@ -413,7 +414,7 @@ rollout 100%: --set service.enabled="$service_enabled" \ --set gitlab.app="$CI_PROJECT_PATH_SLUG" \ --set gitlab.env="$CI_ENVIRONMENT_SLUG" \ - --set releaseOverride="$CI_ENVIRONMENT_SLUG" \ + --set releaseOverride="$RELEASE_NAME" \ --set image.repository="$image_repository" \ --set image.tag="$image_tag" \ --set image.pullPolicy=IfNotPresent \ |