Merge branch 'only-enable-rspec-flaky-listener-when-env-var-is-set' into 'master'

Only use RspecFlaky::Listener when 'FLAKY_RSPEC_GENERATE_REPORT' is set

See merge request gitlab-org/gitlab!24613

scripts/rspec_helpers.sh

@@ -24,7 +24,7 @@ function update_tests_metadata() {
 
   scripts/merge-reports "${FLAKY_RSPEC_SUITE_REPORT_PATH}" rspec_flaky/all_*.json
 
-  export FLAKY_RSPEC_GENERATE_REPORT="1"
+  export FLAKY_RSPEC_GENERATE_REPORT="true"
   scripts/flaky_examples/prune-old-flaky-examples "${FLAKY_RSPEC_SUITE_REPORT_PATH}"
 
   if [[ -n ${TESTS_METADATA_S3_BUCKET} ]]; then

spec/spec_helper.rb

@@ -124,6 +124,9 @@ RSpec.configure do |config|
   if ENV['CI'] || ENV['RETRIES']
     # This includes the first try, i.e. tests will be run 4 times before failing.
     config.default_retry_count = ENV.fetch('RETRIES', 3).to_i + 1
+  end
+
+  if ENV['FLAKY_RSPEC_GENERATE_REPORT']
     config.reporter.register_listener(
       RspecFlaky::Listener.new,
       :example_passed,