Merge branch 'fix-rspec-skipped-flaky-tests-report' into 'master'

Fix broken 'rspec:skipped-flaky-tests-report' job with no reports

See merge request gitlab-org/gitlab!73986

.gitlab/ci/rails.gitlab-ci.yml

@@ -576,12 +576,16 @@ rspec:skipped-flaky-tests-report:
     - rspec-ee unit pg12 geo minimal
     - rspec-ee integration pg12 geo minimal
     - rspec-ee system pg12 geo minimal
+  variables:
+    SKIPPED_FLAKY_TESTS_REPORT: skipped_flaky_tests_report.txt
+  before_script:
+    - mkdir -p rspec_flaky
   script:
-    - cat rspec_flaky/skipped_flaky_tests_*_report.txt >> skipped_flaky_tests_report.txt
+    - find rspec_flaky/ -type f -name 'skipped_flaky_tests_*_report.txt' -exec cat {} + >> "${SKIPPED_FLAKY_TESTS_REPORT}"
   artifacts:
     expire_in: 31d
     paths:
-      - skipped_flaky_tests_report.txt
+      - ${SKIPPED_FLAKY_TESTS_REPORT}
 
 # EE/FOSS: default refs (MRs, default branch, schedules) jobs #
 #######################################################

.gitlab/ci/rules.gitlab-ci.yml

@@ -115,6 +115,9 @@
 .if-security-pipeline-merge-result: &if-security-pipeline-merge-result
   if: '$CI_PIPELINE_SOURCE == "merge_request_event" && $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == $CI_DEFAULT_BRANCH && $CI_PROJECT_NAMESPACE == "gitlab-org/security" && $GITLAB_USER_LOGIN == "gitlab-release-tools-bot"'
 
+.if-skip-flaky-tests-automatically: &if-skip-flaky-tests-automatically
+  if: '$SKIP_FLAKY_TESTS_AUTOMATICALLY == "true"'
+
 ####################
 # Changes patterns #
 ####################
@@ -1357,8 +1360,9 @@
   rules:
     - <<: *if-not-ee
       when: never
-    - if: '$SKIP_FLAKY_TESTS_AUTOMATICALLY == "true"'
+    - <<: *if-skip-flaky-tests-automatically
       changes: *code-backstage-patterns
+    - changes: *ci-patterns
 
 #########################
 # Static analysis rules #