diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-24 18:07:44 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-24 18:07:44 +0300 |
| commit | ac9d41902b722212197aa134f1b309004ebe6c42 (patch) | |
| tree | 52b1ebeb4f8832b7b2af9026b592c338af539bd6 /.gitlab | |
| parent | c6373a2cec855c6543a1e035c52099e102dd05ef (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to '.gitlab')
| -rw-r--r-- | .gitlab/ci/rails.gitlab-ci.yml | 20 |
1 files changed, 16 insertions, 4 deletions
diff --git a/.gitlab/ci/rails.gitlab-ci.yml b/.gitlab/ci/rails.gitlab-ci.yml index 4ac187e1670..885fd109227 100644 --- a/.gitlab/ci/rails.gitlab-ci.yml +++ b/.gitlab/ci/rails.gitlab-ci.yml @@ -57,7 +57,7 @@ setup-test-env: dependencies: ["setup-test-env", "retrieve-tests-metadata", "compile-assets pull-cache"] script: - source scripts/rspec_helpers.sh - - rspec_paralellized_job "--tag ~quarantine --tag ~geo" + - rspec_paralellized_job "--tag ~quarantine --tag ~geo --tag ~level:migration" artifacts: expire_in: 31d when: always @@ -92,12 +92,21 @@ setup-test-env: - .use-pg10 - .only-master +.rspec-base-migration: + script: + - source scripts/rspec_helpers.sh + - rspec_paralellized_job "--tag ~quarantine --tag ~geo --tag level:migration" + rspec migration pg9: - extends: .rspec-base-pg9 + extends: + - .rspec-base-pg9 + - .rspec-base-migration parallel: 4 rspec migration pg9-foss: - extends: .rspec-base-pg9-foss + extends: + - .rspec-base-pg9-foss + - .rspec-base-migration parallel: 4 rspec unit pg9: @@ -149,7 +158,9 @@ rspec system pg10: - .use-pg10-ee rspec-ee migration pg9: - extends: .rspec-ee-base-pg9 + extends: + - .rspec-ee-base-pg9 + - .rspec-base-migration parallel: 2 rspec-ee unit pg9: @@ -167,6 +178,7 @@ rspec-ee system pg9: rspec-ee migration pg10: extends: - .rspec-ee-base-pg10 + - .rspec-base-migration - .only-master parallel: 2 |