Commit 15b55359 authored by Rémy Coutable's avatar Rémy Coutable

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

Signed-off-by: default avatarRémy Coutable <remy@rymai.me>
parent 78703db4
...@@ -571,12 +571,16 @@ rspec:skipped-flaky-tests-report: ...@@ -571,12 +571,16 @@ rspec:skipped-flaky-tests-report:
- rspec-ee unit pg12 geo minimal - rspec-ee unit pg12 geo minimal
- rspec-ee integration pg12 geo minimal - rspec-ee integration pg12 geo minimal
- rspec-ee system 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: 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: artifacts:
expire_in: 31d expire_in: 31d
paths: paths:
- skipped_flaky_tests_report.txt - ${SKIPPED_FLAKY_TESTS_REPORT}
# EE/FOSS: default refs (MRs, default branch, schedules) jobs # # EE/FOSS: default refs (MRs, default branch, schedules) jobs #
####################################################### #######################################################
......
...@@ -115,6 +115,9 @@ ...@@ -115,6 +115,9 @@
.if-security-pipeline-merge-result: &if-security-pipeline-merge-result .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: '$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 # # Changes patterns #
#################### ####################
...@@ -1356,8 +1359,9 @@ ...@@ -1356,8 +1359,9 @@
rules: rules:
- <<: *if-not-ee - <<: *if-not-ee
when: never when: never
- if: '$SKIP_FLAKY_TESTS_AUTOMATICALLY == "true"' - <<: *if-skip-flaky-tests-automatically
changes: *code-backstage-patterns changes: *code-backstage-patterns
- changes: *ci-patterns
######################### #########################
# Static analysis rules # # Static analysis rules #
......
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