diff options
| author | Thong Kuah <tkuah@gitlab.com> | 2019-08-05 02:34:10 +0000 |
|---|---|---|
| committer | Thong Kuah <tkuah@gitlab.com> | 2019-08-05 02:34:10 +0000 |
| commit | 2fd254c6b16f38758ec86fdccfa5c4da61f6ee2b (patch) | |
| tree | e4882d3ee164f45b640faa3eca156321eb709663 | |
| parent | 93c0a47e9dd7fd4a664901a8a7d9c26fbe7d1dfd (diff) | |
| parent | 9775b30c815d80b49c5753cad9f1c1b37eac1ab4 (diff) | |
| download | gitlab-ce-2fd254c6b16f38758ec86fdccfa5c4da61f6ee2b.tar.gz | |
Merge branch 'sh-update-postgresql-ci' into 'master'
Upgrade PostgreSQL versions in CI
See merge request gitlab-org/gitlab-ce!31446
| -rw-r--r-- | .gitlab/ci/frontend.gitlab-ci.yml | 2 | ||||
| -rw-r--r-- | .gitlab/ci/rails.gitlab-ci.yml | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/.gitlab/ci/frontend.gitlab-ci.yml b/.gitlab/ci/frontend.gitlab-ci.yml index a0db84bd25a..d2148f01441 100644 --- a/.gitlab/ci/frontend.gitlab-ci.yml +++ b/.gitlab/ci/frontend.gitlab-ci.yml @@ -8,7 +8,7 @@ .use-pg: &use-pg services: - - name: postgres:9.6.11 + - name: postgres:9.6.14 command: ["postgres", "-c", "fsync=off", "-c", "synchronous_commit=off", "-c", "full_page_writes=off"] - name: redis:alpine diff --git a/.gitlab/ci/rails.gitlab-ci.yml b/.gitlab/ci/rails.gitlab-ci.yml index 24b4eb3a4c1..8a89232fdd4 100644 --- a/.gitlab/ci/rails.gitlab-ci.yml +++ b/.gitlab/ci/rails.gitlab-ci.yml @@ -1,12 +1,12 @@ .use-pg: &use-pg services: - - name: postgres:9.6.11 + - name: postgres:9.6.14 command: ["postgres", "-c", "fsync=off", "-c", "synchronous_commit=off", "-c", "full_page_writes=off"] - name: redis:alpine .use-pg-10: &use-pg-10 services: - - name: postgres:10.7 + - name: postgres:10.9 command: ["postgres", "-c", "fsync=off", "-c", "synchronous_commit=off", "-c", "full_page_writes=off"] - name: redis:alpine |