Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2022-06-22 15:08:59 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2022-06-22 15:08:59 +0300
commit421f6c92d5984d035a7a6687d70277ba88f5f92b (patch)
tree35286624cfbc591c0f60bf1f0851492cd9d74ae3 /scripts/rspec_helpers.sh
parent44c4a8ee1e7b995aa2045fd31d637981eb3baccb (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'scripts/rspec_helpers.sh')
-rw-r--r--scripts/rspec_helpers.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/rspec_helpers.sh b/scripts/rspec_helpers.sh
index af09d6d0edd..a67e1b8ac66 100644
--- a/scripts/rspec_helpers.sh
+++ b/scripts/rspec_helpers.sh
@@ -309,7 +309,7 @@ function retry_failed_rspec_examples() {
rspec_run_status=$?
# Merge the JUnit report from retry into the first-try report
- junit_merge "${JUNIT_RETRY_FILE}" "${JUNIT_RESULT_FILE}"
+ junit_merge "${JUNIT_RETRY_FILE}" "${JUNIT_RESULT_FILE}" --update-only
exit $rspec_run_status
}