summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Speicher <robert@gitlab.com>2018-10-02 20:00:20 +0000
committerRobert Speicher <robert@gitlab.com>2018-10-02 20:00:20 +0000
commitb609c8f650ca9854d12edbf623f2419c216e73a7 (patch)
treed67c690dde1403531275b288d2111b3abf8f7687
parent9ab5910065c22b6e26fd7906d32bf457f3abb07d (diff)
parente1294022875138b40db7d34a9f33ac9f4a7dc655 (diff)
downloadgitlab-ce-b609c8f650ca9854d12edbf623f2419c216e73a7.tar.gz
Merge branch 'test-against-postgres-96' into 'master'
Use minimum recommended PostgreSQL version to run our tests See merge request gitlab-org/gitlab-ce!22060
-rw-r--r--.gitlab-ci.yml5
1 files changed, 1 insertions, 4 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 02a9f399193..2a299ea79ef 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -67,10 +67,7 @@ stages:
.use-pg: &use-pg
services:
- # As of Jan 2018, we don't have a strong reason to upgrade to 9.6 for CI yet,
- # so using the least common denominator ensures backwards compatibility
- # (as many users are still using 9.2).
- - postgres:9.2
+ - postgres:9.6
- redis:alpine
.use-mysql: &use-mysql