From 6229528c00a55dc71a589fa6ee04c7e8fb272b3f Mon Sep 17 00:00:00 2001 From: Lin Jen-Shin Date: Thu, 22 Feb 2024 01:06:05 +0800 Subject: [PATCH] Stop retrying for almost all directories Except for features --- spec/spec_helper.rb | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index bb054b274ae1e7..83bb6ea38e67e8 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 -- GitLab