diff options
Diffstat (limited to '.gitlab/ci/rails')
-rw-r--r-- | .gitlab/ci/rails/shared.gitlab-ci.yml | 43 |
1 files changed, 41 insertions, 2 deletions
diff --git a/.gitlab/ci/rails/shared.gitlab-ci.yml b/.gitlab/ci/rails/shared.gitlab-ci.yml index 6803bdd3386..e9041e197cc 100644 --- a/.gitlab/ci/rails/shared.gitlab-ci.yml +++ b/.gitlab/ci/rails/shared.gitlab-ci.yml @@ -27,6 +27,7 @@ include: - section_start "gitaly-test-spawn" "Spawning Gitaly"; scripts/gitaly-test-spawn; section_end "gitaly-test-spawn" # Do not use 'bundle exec' here - export RSPEC_SKIPPED_TESTS_REPORT_PATH="rspec/skipped_tests-${CI_JOB_ID}.txt" - export RSPEC_RETRIED_TESTS_REPORT_PATH="rspec/retried_tests-${CI_JOB_ID}.txt" + - tooling/bin/create_job_metrics_file || true .no-redis-cluster: variables: @@ -78,7 +79,7 @@ include: # spec/lib, yet background migration tests are also sitting there, # and they should run on their own jobs so we don't need to run them # in unit tests again. - - rspec_paralellized_job "--fail-fast=${RSPEC_FAIL_FAST_THRESHOLD} --tag ~quarantine --tag ~level:background_migration --tag ~click_house" + - rspec_paralellized_job "--fail-fast=${RSPEC_FAIL_FAST_THRESHOLD} --tag ~quarantine --tag ~level:background_migration --tag ~click_house --tag ~real_ai_request" after_script: - echo -e "\e[0Ksection_start:`date +%s`:report_results_section[collapsed=true]\r\e[0KReport results" - | @@ -92,6 +93,7 @@ include: bundle exec slow-test-merge-request-report-note --input-files "rspec/rspec-*.json" --project "gitlab-org/gitlab" --merge_request_iid "$CI_MERGE_REQUEST_IID" --token "${TEST_SLOW_NOTE_PROJECT_TOKEN}"; fi - echo -e "\e[0Ksection_end:`date +%s`:report_results_section\r\e[0K" + - tooling/bin/push_job_metrics || true allow_failure: exit_codes: !reference [.rspec-base, variables, SUCCESSFULLY_RETRIED_TEST_EXIT_CODE] @@ -247,7 +249,7 @@ include: ############################ # rspec job parallel configs -# Adjusting these parallel job counts has an impact on the +# Adjusting these parallel job counts has an impact on the # rspec:artifact-collector jobs in .gitlab/ci/rails.gitlab-ci.yml # Please double-check and adjust accordingly .rspec-migration-parallel: @@ -279,5 +281,42 @@ include: .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 ############################ |