From 5d32a7a175fd1a7a6c97019a022c11434ea637dc Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Fri, 3 Apr 2020 00:07:49 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- qa/spec/spec_helper.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'qa/spec') diff --git a/qa/spec/spec_helper.rb b/qa/spec/spec_helper.rb index 1336bea16bc..0f818b9f89a 100644 --- a/qa/spec/spec_helper.rb +++ b/qa/spec/spec_helper.rb @@ -63,8 +63,9 @@ RSpec.configure do |config| config.display_try_failure_messages = true if ENV['CI'] && !QA::Runtime::Env.disable_rspec_retry? + non_quarantine_retries = QA::Runtime::Env.ci_project_name =~ /staging|canary|production/ ? 3 : 2 config.around do |example| - retry_times = example.metadata.key?(:quarantine) ? 1 : 2 + retry_times = example.metadata.key?(:quarantine) ? 1 : non_quarantine_retries example.run_with_retry retry: retry_times end end -- cgit v1.2.3