diff options
| author | Thong Kuah <tkuah@gitlab.com> | 2019-07-06 08:33:03 +0000 |
|---|---|---|
| committer | Thong Kuah <tkuah@gitlab.com> | 2019-07-06 08:33:03 +0000 |
| commit | 688f47eeb885b76f7d1ec5291d7686978dc95c40 (patch) | |
| tree | eabcb57895c4ff6d2581aecfc73acd5c76d78cf0 | |
| parent | 6e9f882007a18d594b4a53e417a87fdeec3bc29f (diff) | |
| parent | a8060ee7494b26418d4ce9abf86da49195850977 (diff) | |
| download | gitlab-ce-688f47eeb885b76f7d1ec5291d7686978dc95c40.tar.gz | |
Merge branch 'revert-01c917e3' into 'master'
Revert "Increase rspec parallelism"
See merge request gitlab-org/gitlab-ce!30429
| -rw-r--r-- | .gitlab/ci/rails.gitlab-ci.yml | 4 |
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 |