From c384315ae1ea48df2a741874b326581ded0a97e1 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Tue, 3 Dec 2019 09:09:09 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- qa/spec/spec_helper.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'qa/spec') diff --git a/qa/spec/spec_helper.rb b/qa/spec/spec_helper.rb index 42f1e6f292a..36a1b901c65 100644 --- a/qa/spec/spec_helper.rb +++ b/qa/spec/spec_helper.rb @@ -62,7 +62,7 @@ RSpec.configure do |config| # show exception that triggers a retry if verbose_retry is set to true config.display_try_failure_messages = true - if ENV['CI'] + if ENV['CI'] && !QA::Runtime::Env.disable_rspec_retry? config.around do |example| retry_times = example.metadata.key?(:quarantine) ? 1 : 2 example.run_with_retry retry: retry_times -- cgit v1.2.1