From 30b8ea126ffffc9bef610d38f8ebcd91bb687aba Mon Sep 17 00:00:00 2001
From: GitLab Bot <gitlab-bot@gitlab.com>
Date: Mon, 31 Oct 2022 18:09:25 +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 73030d2ad6c..3c96635896e 100644
--- a/scripts/rspec_helpers.sh
+++ b/scripts/rspec_helpers.sh
@@ -61,6 +61,9 @@ function update_tests_metadata() {
 
   export FLAKY_RSPEC_GENERATE_REPORT="true"
   scripts/merge-reports "${FLAKY_RSPEC_SUITE_REPORT_PATH}" ${rspec_flaky_folder_path}all_*.json
+
+  # Prune flaky tests that weren't flaky in the last 7 days, *after* updating the flaky tests detected
+  # in this pipeline, so that first_flaky_at for tests that are still flaky is maintained.
   scripts/flaky_examples/prune-old-flaky-examples "${FLAKY_RSPEC_SUITE_REPORT_PATH}"
 
   if [[ "$CI_PIPELINE_SOURCE" == "schedule" ]]; then
-- 
cgit v1.2.1