Merge branch '345798-set-retry-metadata' into 'master'

Set retry metadata instead of running with around

See merge request gitlab-org/gitlab!74617

spec/spec_helper.rb

@@ -201,8 +201,8 @@ RSpec.configure do |config|
     # Do not retry controller tests because rspec-retry cannot properly
     # reset the controller which may contain data from last attempt. See
     # https://gitlab.com/gitlab-org/gitlab/-/merge_requests/73360
-    config.around(:each, type: :controller) do |example|
-      example.run_with_retry(retry: 1)
+    config.prepend_before(:each, type: :controller) do |example|
+      example.metadata[:retry] = 1
     end
 
     config.exceptions_to_hard_fail = [DeprecationToolkitEnv::DeprecationBehaviors::SelectiveRaise::RaiseDisallowedDeprecation]