diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-18 12:35:46 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-18 12:35:46 +0000 |
| commit | 139ecc6cc9017b716e4aecc44c665fd9d4314dbb (patch) | |
| tree | 1cf7599ac408c4c64e7fc02df1ecd1841344454a | |
| parent | 0ae2b9d4fcb99096038c41752987bdc198814b9d (diff) | |
| download | gitlab-ce-12-5-stable.tar.gz | |
Add latest changes from gitlab-org/gitlab@12-5-stable-ee12-5-stable
| -rw-r--r-- | .gitlab/ci/global.gitlab-ci.yml | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/.gitlab/ci/global.gitlab-ci.yml b/.gitlab/ci/global.gitlab-ci.yml index d746d8fe030..06dc3d745d4 100644 --- a/.gitlab/ci/global.gitlab-ci.yml +++ b/.gitlab/ci/global.gitlab-ci.yml @@ -200,6 +200,8 @@ - name: postgres:9.6 command: ["postgres", "-c", "fsync=off", "-c", "synchronous_commit=off", "-c", "full_page_writes=off"] - name: redis:alpine + variables: + POSTGRES_HOST_AUTH_METHOD: trust .use-pg10: image: "registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.6.3-golang-1.11-git-2.22-chrome-73.0-node-12.x-yarn-1.16-postgresql-10-graphicsmagick-1.3.33" @@ -207,6 +209,8 @@ - name: postgres:10.9 command: ["postgres", "-c", "fsync=off", "-c", "synchronous_commit=off", "-c", "full_page_writes=off"] - name: redis:alpine + variables: + POSTGRES_HOST_AUTH_METHOD: trust .use-pg9-ee: services: @@ -214,6 +218,8 @@ command: ["postgres", "-c", "fsync=off", "-c", "synchronous_commit=off", "-c", "full_page_writes=off"] - name: redis:alpine - name: docker.elastic.co/elasticsearch/elasticsearch:5.6.12 + variables: + POSTGRES_HOST_AUTH_METHOD: trust .use-pg10-ee: image: "registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.6.3-golang-1.11-git-2.22-chrome-73.0-node-12.x-yarn-1.16-postgresql-10-graphicsmagick-1.3.33" @@ -222,6 +228,8 @@ command: ["postgres", "-c", "fsync=off", "-c", "synchronous_commit=off", "-c", "full_page_writes=off"] - name: redis:alpine - name: docker.elastic.co/elasticsearch/elasticsearch:5.6.12 + variables: + POSTGRES_HOST_AUTH_METHOD: trust .only-ee: only: |