Commit 688f47ee authored by Thong Kuah's avatar Thong Kuah

Merge branch 'revert-01c917e3' into 'master'

Revert "Increase rspec parallelism"

See merge request gitlab-org/gitlab-ce!30429
parents 6e9f8820 a8060ee7
...@@ -139,7 +139,7 @@ setup-test-env: ...@@ -139,7 +139,7 @@ setup-test-env:
rspec unit pg: rspec unit pg:
<<: *rspec-metadata-pg <<: *rspec-metadata-pg
parallel: 25 parallel: 20
rspec integration pg: rspec integration pg:
<<: *rspec-metadata-pg <<: *rspec-metadata-pg
...@@ -152,7 +152,7 @@ rspec system pg: ...@@ -152,7 +152,7 @@ rspec system pg:
rspec unit pg-10: rspec unit pg-10:
<<: *rspec-metadata-pg-10 <<: *rspec-metadata-pg-10
<<: *only-schedules-master <<: *only-schedules-master
parallel: 25 parallel: 20
rspec integration pg-10: rspec integration pg-10:
<<: *rspec-metadata-pg-10 <<: *rspec-metadata-pg-10
......
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