diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index bb054b274ae1e7b4547e6489683f157992b840e9..83bb6ea38e67e8031c7be2dea4286c80c5443df8 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -216,16 +216,11 @@ # This includes the first try, i.e. tests will be run 2 times before failing. config.default_retry_count = ENV.fetch('RETRIES', 1).to_i + 1 - # 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.prepend_before(:each, type: :controller) do |example| - example.metadata[:retry] = 1 - end - # Gradually stop using rspec-retry # See https://gitlab.com/gitlab-org/gitlab/-/issues/438388 %i[ + bin channels commands components config contracts controller db + dependencies dot_gitlab_ci experiments finders graphql haml_lint helpers initializers keeps lib mailers metrics_server migrations models policies presenters rack_servers requests routing rubocop scripts serializers services sidekiq sidekiq_cluster