From f46d20e5088ca9c58793e3b6044facfa74feb7ed Mon Sep 17 00:00:00 2001
From: GitLab Bot <gitlab-bot@gitlab.com>
Date: Thu, 23 Jun 2022 12:09:30 +0000
Subject: Add latest changes from gitlab-org/gitlab@master

---
 scripts/rspec_helpers.sh | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'scripts/rspec_helpers.sh')

diff --git a/scripts/rspec_helpers.sh b/scripts/rspec_helpers.sh
index a67e1b8ac66..b31e3663eaa 100644
--- a/scripts/rspec_helpers.sh
+++ b/scripts/rspec_helpers.sh
@@ -304,6 +304,9 @@ function retry_failed_rspec_examples() {
   # Disable Crystalball on retry to not overwrite the existing report
   export CRYSTALBALL="false"
 
+  # Disable simplecov so retried tests don't override test coverage report
+  export SIMPLECOV=0
+
   # Retry only the tests that failed on first try
   rspec_simple_job "--only-failures --pattern \"${KNAPSACK_TEST_FILE_PATTERN}\"" "${JUNIT_RETRY_FILE}"
   rspec_run_status=$?
-- 
cgit v1.2.1