Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
15b55359
Commit
15b55359
authored
Nov 08, 2021
by
Rémy Coutable
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix broken 'rspec:skipped-flaky-tests-report' job with no reports
Signed-off-by:
Rémy Coutable
<
remy@rymai.me
>
parent
78703db4
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
3 deletions
+11
-3
.gitlab/ci/rails.gitlab-ci.yml
.gitlab/ci/rails.gitlab-ci.yml
+6
-2
.gitlab/ci/rules.gitlab-ci.yml
.gitlab/ci/rules.gitlab-ci.yml
+5
-1
No files found.
.gitlab/ci/rails.gitlab-ci.yml
View file @
15b55359
...
...
@@ -571,12 +571,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
View file @
15b55359
...
...
@@ -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 #
####################
...
...
@@ -1356,8 +1359,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 #
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment