diff options
Diffstat (limited to '.gitlab/ci/rails/shared.gitlab-ci.yml')
| -rw-r--r-- | .gitlab/ci/rails/shared.gitlab-ci.yml | 69 |
1 files changed, 18 insertions, 51 deletions
diff --git a/.gitlab/ci/rails/shared.gitlab-ci.yml b/.gitlab/ci/rails/shared.gitlab-ci.yml index 3194ac0c26f..1f420b9b8ec 100644 --- a/.gitlab/ci/rails/shared.gitlab-ci.yml +++ b/.gitlab/ci/rails/shared.gitlab-ci.yml @@ -56,10 +56,18 @@ include: variables: GITALY_PRAEFECT_WITH_DB: '1' +.rspec-base-needs: + needs: + - job: "clone-gitlab-repo" + optional: true # Optional so easier to switch in between + - job: "setup-test-env" + - job: "retrieve-tests-metadata" + .rspec-base: extends: - .rails-job-base - .base-artifacts + - .repo-from-artifacts stage: test variables: RUBY_GC_MALLOC_LIMIT: 67108864 @@ -69,8 +77,7 @@ include: SUCCESSFULLY_RETRIED_TEST_EXIT_CODE: 137 EVENT_PROF: "sql.active_record" needs: - - job: "setup-test-env" - - job: "retrieve-tests-metadata" + - !reference [.rspec-base-needs, needs] - job: "compile-test-assets" - job: "detect-tests" optional: true @@ -163,8 +170,7 @@ include: - .as-if-foss - .use-pg14 needs: - - job: "setup-test-env" - - job: "retrieve-tests-metadata" + - !reference [.rspec-base-needs, needs] - job: "compile-test-assets as-if-foss" - job: "detect-tests" optional: true @@ -259,10 +265,10 @@ include: # rspec:artifact-collector jobs in .gitlab/ci/rails.gitlab-ci.yml # Please double-check and adjust accordingly .rspec-migration-parallel: - parallel: 8 + parallel: 15 .rspec-background-migration-parallel: - parallel: 4 + parallel: 5 .rspec-ee-migration-parallel: parallel: 2 @@ -271,58 +277,19 @@ include: parallel: 2 .rspec-unit-parallel: - parallel: 28 + parallel: 32 .rspec-ee-unit-parallel: - parallel: 18 + parallel: 28 .rspec-integration-parallel: - parallel: 12 + parallel: 16 .rspec-ee-integration-parallel: - parallel: 6 + parallel: 7 .rspec-system-parallel: - parallel: 28 + parallel: 32 .rspec-ee-system-parallel: - parallel: 10 - -# Optimizations to distribute CI time more evenly across the CI/CD pipeline -# -# See https://gitlab.com/gitlab-org/gitlab/-/merge_requests/133976 for more info - -# Giving 4 jobs to `rspec-ee unit pg14` -.rspec-unit-pg14-parallel: - parallel: 24 - -# Receiving 4 jobs from `rspec unit pg14` -.rspec-ee-unit-pg14-parallel: - parallel: 22 - -# Giving 2 jobs to `rspec-ee system pg14` -.rspec-system-parallel-pg14: - parallel: 26 - -# Receiving 2 jobs from `rspec system pg14` -.rspec-ee-system-parallel-pg14: - parallel: 12 - -# Adding 4 jobs, as those needs to be a bit faster. -.rspec-migration-parallel-pg14: - parallel: 12 - -# Adding 2 jobs, as those needs to be a bit faster. -.rspec-migration-parallel-pg14-as-if-foss: - parallel: 10 - -# Giving 1 job to `rspec integration pg14` -.rspec-ee-integration-parallel-pg14: - parallel: 5 - -# Receiving 1 job from `rspec-ee integration pg14` -.rspec-integration-parallel-pg14: - parallel: 13 - -# rspec job parallel configs -############################ + parallel: 14 |