diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-10-09 21:08:34 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-10-09 21:08:34 +0000 |
| commit | 50d3b4e4fe6d1f0917caf400418d7b90d7fe6e67 (patch) | |
| tree | 7d20a73adfec893a8cfea1716952af69c0b72d90 | |
| parent | 960d1d4c59270049f24e09084874b10997dc79de (diff) | |
| download | gitlab-ce-79273-broken-master-spec-factories_spec-rb-got-nameerror-uninitialized-constant-resourceweightevent.tar.gz | |
Add latest changes from gitlab-org/gitlab@master79273-broken-master-spec-factories_spec-rb-got-nameerror-uninitialized-constant-resourceweightevent
| -rw-r--r-- | changelogs/unreleased/use-bitnami-postgres-for-test-template.yml | 5 | ||||
| -rw-r--r-- | lib/gitlab/ci/templates/Jobs/Test.gitlab-ci.yml | 5 |
2 files changed, 2 insertions, 8 deletions
diff --git a/changelogs/unreleased/use-bitnami-postgres-for-test-template.yml b/changelogs/unreleased/use-bitnami-postgres-for-test-template.yml deleted file mode 100644 index a3ca1915fa0..00000000000 --- a/changelogs/unreleased/use-bitnami-postgres-for-test-template.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: 'Switch Auto Test CI template to `bitnami/postgresql` docker image (was previously `postgres`)' -merge_request: 44329 -author: -type: changed diff --git a/lib/gitlab/ci/templates/Jobs/Test.gitlab-ci.yml b/lib/gitlab/ci/templates/Jobs/Test.gitlab-ci.yml index a7352f770d6..3b87d53f165 100644 --- a/lib/gitlab/ci/templates/Jobs/Test.gitlab-ci.yml +++ b/lib/gitlab/ci/templates/Jobs/Test.gitlab-ci.yml @@ -1,10 +1,9 @@ test: variables: - POSTGRES_VERSION: 9.6.16 # This is the version used by Auto Deploy by default, see https://hub.docker.com/r/bitnami/postgresql/tags for available tags + POSTGRES_VERSION: 9.6.16 POSTGRES_DB: test services: - - name: "bitnami/postgresql:${POSTGRES_VERSION}" - alias: postgres + - "postgres:${POSTGRES_VERSION}" stage: test image: gliderlabs/herokuish:latest needs: [] |