summaryrefslogtreecommitdiff
path: root/.gitlab
diff options
context:
space:
mode:
authorRobert Speicher <rspeicher@gmail.com>2019-06-27 17:34:39 +0000
committerRobert Speicher <rspeicher@gmail.com>2019-06-27 17:34:39 +0000
commit01c917e358769b4d49b065dd0d49c92e97b64362 (patch)
treeccd8bbbd6a6896651ca39ef1bcb167de2c616d68 /.gitlab
parent1d78c69c6210b6bb852b8668b3f75b058e3b5a16 (diff)
parent859594a88d99975a0ef01afcb99002f7e111ad57 (diff)
downloadgitlab-ce-01c917e358769b4d49b065dd0d49c92e97b64362.tar.gz
Merge branch '63825-increase-rspec-parallelism' into 'master'
Attempt to work around migration spec failures by increasing parallelism See merge request gitlab-org/gitlab-ce!30130
Diffstat (limited to '.gitlab')
-rw-r--r--.gitlab/ci/rails.gitlab-ci.yml4
1 files changed, 2 insertions, 2 deletions
diff --git a/.gitlab/ci/rails.gitlab-ci.yml b/.gitlab/ci/rails.gitlab-ci.yml
index 529a0de696b..6551f47d3be 100644
--- a/.gitlab/ci/rails.gitlab-ci.yml
+++ b/.gitlab/ci/rails.gitlab-ci.yml
@@ -139,7 +139,7 @@ setup-test-env:
rspec unit pg:
<<: *rspec-metadata-pg
- parallel: 20
+ parallel: 25
rspec integration pg:
<<: *rspec-metadata-pg
@@ -152,7 +152,7 @@ rspec system pg:
rspec unit pg-10:
<<: *rspec-metadata-pg-10
<<: *only-schedules-master
- parallel: 20
+ parallel: 25
rspec integration pg-10:
<<: *rspec-metadata-pg-10