Commit 1cfd81fe authored by Rémy Coutable's avatar Rémy Coutable

Merge branch 'pg-10-specs' into 'master'

Add test suite with PostgreSQL 10 to be run on a schedule.

Also, move MySQL tests to run only on master branch, and on schedules.

See merge request gitlab-org/gitlab-ce!26920
parents f15caf01 397a6280
...@@ -76,6 +76,11 @@ stages: ...@@ -76,6 +76,11 @@ stages:
- postgres:9.6 - postgres:9.6
- redis:alpine - redis:alpine
.use-pg-10: &use-pg-10
services:
- postgres:10.0
- redis:alpine
.use-mysql: &use-mysql .use-mysql: &use-mysql
services: services:
- mysql:5.7 - mysql:5.7
...@@ -97,6 +102,15 @@ stages: ...@@ -97,6 +102,15 @@ stages:
- /(^docs[\/-].*|.*-docs$)/ - /(^docs[\/-].*|.*-docs$)/
- /(^qa[\/-].*|.*-qa$)/ - /(^qa[\/-].*|.*-qa$)/
.only-schedules-master: &only-schedules-master
only:
- schedules@gitlab-org/gitlab-ce
- schedules@gitlab-org/gitlab-ee
- master@gitlab-org/gitlab-ce
- master@gitlab-org/gitlab-ee
- master@gitlab/gitlabhq
- master@gitlab/gitlab-ee
# Jobs that only need to pull cache # Jobs that only need to pull cache
.dedicated-no-docs-pull-cache-job: &dedicated-no-docs-pull-cache-job .dedicated-no-docs-pull-cache-job: &dedicated-no-docs-pull-cache-job
<<: *dedicated-runner <<: *dedicated-runner
...@@ -172,6 +186,11 @@ stages: ...@@ -172,6 +186,11 @@ stages:
<<: *rspec-metadata <<: *rspec-metadata
<<: *use-pg <<: *use-pg
.rspec-metadata-pg-10: &rspec-metadata-pg-10
<<: *rspec-metadata
<<: *use-pg-10
image: "dev.gitlab.org:5005/gitlab/gitlab-build-images:ruby-2.5.3-golang-1.11-git-2.18-chrome-71.0-node-10.x-yarn-1.12-postgresql-10-graphicsmagick-1.3.29"
.rspec-metadata-mysql: &rspec-metadata-mysql .rspec-metadata-mysql: &rspec-metadata-mysql
<<: *rspec-metadata <<: *rspec-metadata
<<: *use-mysql <<: *use-mysql
...@@ -457,6 +476,8 @@ setup-test-env: ...@@ -457,6 +476,8 @@ setup-test-env:
- schedules@gitlab-org/gitlab-ce - schedules@gitlab-org/gitlab-ce
- schedules@gitlab-org/gitlab-ee - schedules@gitlab-org/gitlab-ee
kubernetes: active kubernetes: active
variables:
- $REVIEW_APP_CLEANUP
except: except:
refs: refs:
- tags - tags
...@@ -525,8 +546,14 @@ rspec-pg: ...@@ -525,8 +546,14 @@ rspec-pg:
<<: *rspec-metadata-pg <<: *rspec-metadata-pg
parallel: 50 parallel: 50
rspec-pg-10:
<<: *rspec-metadata-pg-10
<<: *only-schedules-master
parallel: 50
rspec-mysql: rspec-mysql:
<<: *rspec-metadata-mysql <<: *rspec-metadata-mysql
<<: *only-schedules-master
parallel: 50 parallel: 50
.rspec-quarantine: &rspec-quarantine .rspec-quarantine: &rspec-quarantine
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment