From ed233707ec5212b18321ccdb5a5309a42ba9867d Mon Sep 17 00:00:00 2001
From: ddieulivol <ddieulivol@gitlab.com>
Date: Wed, 17 Sep 2025 07:10:44 +0200
Subject: [PATCH] Only do unit test report in individual RSpec jobs

---
 .gitlab/ci/rails.gitlab-ci.yml        |  2 +-
 .gitlab/ci/rails/shared.gitlab-ci.yml | 29 +++++++++++++++++----------
 2 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/.gitlab/ci/rails.gitlab-ci.yml b/.gitlab/ci/rails.gitlab-ci.yml
index 494045afdf1462..b84a45cfa5666f 100644
--- a/.gitlab/ci/rails.gitlab-ci.yml
+++ b/.gitlab/ci/rails.gitlab-ci.yml
@@ -441,7 +441,7 @@ gitlab:setup:
 # These intermediate jobs allow us to collect the artifacts of
 # more than 50 jobs and still use `needs:` to ensure a timely execution
 .artifact-collector:
-  extends: .base-artifacts
+  extends: .base-artifacts-collector
   stage: post-test
   variables:
     GIT_STRATEGY: none
diff --git a/.gitlab/ci/rails/shared.gitlab-ci.yml b/.gitlab/ci/rails/shared.gitlab-ci.yml
index ab1f1af7fd8dbd..674007cd048cb2 100644
--- a/.gitlab/ci/rails/shared.gitlab-ci.yml
+++ b/.gitlab/ci/rails/shared.gitlab-ci.yml
@@ -212,22 +212,29 @@ include:
       section_end "knapsack-report-issues"
     - scripts/minify-simplecov-resultsets.rb
 
+.artifacts-config: &artifacts-config
+  expire_in: 31d
+  when: always
+  paths:
+    - auto_explain/
+    - coverage/
+    - crystalball/
+    - deprecations/
+    - knapsack/
+    - rspec/
+    - tmp/capybara/
+    - log/*.log
+
 .base-artifacts:
   artifacts:
-    expire_in: 31d
-    when: always
-    paths:
-      - auto_explain/
-      - coverage/
-      - crystalball/
-      - deprecations/
-      - knapsack/
-      - rspec/
-      - tmp/capybara/
-      - log/*.log
+    <<: *artifacts-config
     reports:
       junit: "rspec/rspec-*.xml"
 
+.base-artifacts-collector:
+  artifacts:
+    <<: *artifacts-config
+
 .rspec-base-migration:
   script:
     - !reference [.base-script, script]
-- 
GitLab