diff options
| author | Sean McGivern <sean@gitlab.com> | 2019-02-25 11:04:59 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@gitlab.com> | 2019-02-25 11:04:59 +0000 |
| commit | c39e094bc863180e351d36207b98b1680c4c8e5d (patch) | |
| tree | 6966afd192379a6e53aacf53cb0bd693cbb15cd9 /lib | |
| parent | cc4e8478a64f05aad2836b9bbacab8b07883c9df (diff) | |
| parent | 2f599abab08fb262ce185b4f4edbd7eb930bd432 (diff) | |
| download | gitlab-ce-c39e094bc863180e351d36207b98b1680c4c8e5d.tar.gz | |
Merge branch '58098-auto-devops-postgres-version-variable' into 'master'
Allow configuring POSTGRES_VERSION in Auto DevOps
Closes #58098
See merge request gitlab-org/gitlab-ce!25500
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/gitlab/ci/templates/Auto-DevOps.gitlab-ci.yml | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/gitlab/ci/templates/Auto-DevOps.gitlab-ci.yml b/lib/gitlab/ci/templates/Auto-DevOps.gitlab-ci.yml index 7c1182d4293..37fc1fccfb9 100644 --- a/lib/gitlab/ci/templates/Auto-DevOps.gitlab-ci.yml +++ b/lib/gitlab/ci/templates/Auto-DevOps.gitlab-ci.yml @@ -48,6 +48,7 @@ variables: POSTGRES_PASSWORD: testing-password POSTGRES_ENABLED: "true" POSTGRES_DB: $CI_ENVIRONMENT_SLUG + POSTGRES_VERSION: 9.6.2 KUBERNETES_VERSION: 1.11.7 HELM_VERSION: 2.12.3 @@ -700,6 +701,7 @@ rollout 100%: --set postgresql.postgresUser="$POSTGRES_USER" \ --set postgresql.postgresPassword="$POSTGRES_PASSWORD" \ --set postgresql.postgresDatabase="$POSTGRES_DB" \ + --set postgresql.imageTag="$POSTGRES_VERSION" \ --set application.initializeCommand="$DB_INITIALIZE" \ --namespace="$KUBE_NAMESPACE" \ "$name" \ |