summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Thomas <nick@gitlab.com>2019-07-05 21:52:16 +0000
committerNick Thomas <nick@gitlab.com>2019-07-05 21:52:16 +0000
commita8060ee7494b26418d4ce9abf86da49195850977 (patch)
tree8b8e510869e399faeee52100d997b25597c9dd51
parentc0e193db9ee51dcd1779c4ff787c63dab926aa1c (diff)
downloadgitlab-ce-a8060ee7494b26418d4ce9abf86da49195850977.tar.gz
Revert "Merge branch '63825-increase-rspec-parallelism' into 'master'"revert-01c917e3
This reverts merge request !30130
-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 01c96e06547..2d06a8acc58 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: 25
+ parallel: 20
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: 25
+ parallel: 20
rspec integration pg-10:
<<: *rspec-metadata-pg-10