From 421f6c92d5984d035a7a6687d70277ba88f5f92b Mon Sep 17 00:00:00 2001
From: GitLab Bot <gitlab-bot@gitlab.com>
Date: Wed, 22 Jun 2022 12:08:59 +0000
Subject: Add latest changes from gitlab-org/gitlab@master

---
 scripts/rspec_helpers.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'scripts/rspec_helpers.sh')

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
 }
-- 
cgit v1.2.1