diff options
| author | Stan Hu <stanhu@gmail.com> | 2019-07-02 20:47:13 +0000 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2019-07-02 20:47:13 +0000 |
| commit | 3814285bb2ff6d9725a46a918e689ff3d154ce04 (patch) | |
| tree | d81bd26be2910d707edbe37ffaa32a64470ce3db /.gitlab | |
| parent | f6ea17ed6d412ab2117e7d71aa0d10f3af7876ad (diff) | |
| parent | 2f76ccd4413a5af54aa839c53f04f3760357c465 (diff) | |
| download | gitlab-ce-3814285bb2ff6d9725a46a918e689ff3d154ce04.tar.gz | |
Merge branch 'use-pg-9.6.11-on-ci' into 'master'
Use PostgreSQL 9.6.11 in CI tests
See merge request gitlab-org/gitlab-ce!30270
Diffstat (limited to '.gitlab')
| -rw-r--r-- | .gitlab/ci/frontend.gitlab-ci.yml | 2 | ||||
| -rw-r--r-- | .gitlab/ci/rails.gitlab-ci.yml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/.gitlab/ci/frontend.gitlab-ci.yml b/.gitlab/ci/frontend.gitlab-ci.yml index 0c0985decdd..45a6a177943 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 + - name: postgres:9.6.11 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 f2ada743bf3..01c96e06547 100644 --- a/.gitlab/ci/rails.gitlab-ci.yml +++ b/.gitlab/ci/rails.gitlab-ci.yml @@ -1,6 +1,6 @@ .use-pg: &use-pg services: - - name: postgres:9.6 + - name: postgres:9.6.11 command: ["postgres", "-c", "fsync=off", "-c", "synchronous_commit=off", "-c", "full_page_writes=off"] - name: redis:alpine |