diff options
| author | Rémy Coutable <remy@rymai.me> | 2018-01-12 08:00:23 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2018-01-12 08:00:23 +0000 |
| commit | 196be7b1dec7e93761160488311807b44510f5fc (patch) | |
| tree | 94ee85448a765ec1bb18005f99c92f2e9c4fd5ff | |
| parent | 16e895801e5ba2f27de6d33511c8ac46297048eb (diff) | |
| parent | 6aaf096e2fff10e12645e84d10d1b2fa4b11cf56 (diff) | |
| download | gitlab-ce-196be7b1dec7e93761160488311807b44510f5fc.tar.gz | |
Merge branch '41749-postgres-9.6-for-ci-tests' into 'master'
Add reason to keep postgresql 9.2 for CI
See merge request gitlab-org/gitlab-ce!16277
| -rw-r--r-- | .gitlab-ci.yml | 3 | ||||
| -rw-r--r-- | changelogs/unreleased/41749-postgres-9-6-for-ci-tests.yml | 5 |
2 files changed, 8 insertions, 0 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f038ce72aeb..80ba8e5c1a1 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -61,6 +61,9 @@ 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 - redis:alpine diff --git a/changelogs/unreleased/41749-postgres-9-6-for-ci-tests.yml b/changelogs/unreleased/41749-postgres-9-6-for-ci-tests.yml new file mode 100644 index 00000000000..2a3d00f8e5f --- /dev/null +++ b/changelogs/unreleased/41749-postgres-9-6-for-ci-tests.yml @@ -0,0 +1,5 @@ +--- +title: Add reason to keep postgresql 9.2 for CI +merge_request: 16277 +author: Takuya Noguchi +type: other |