diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-03 03:07:49 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-03 03:07:49 +0300 |
| commit | 5d32a7a175fd1a7a6c97019a022c11434ea637dc (patch) | |
| tree | 8741a075a83a139de103915278b87e66da6efb03 /qa/spec | |
| parent | d74fcc9b69746c4d9582299c370a95aafe2ac3ac (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'qa/spec')
| -rw-r--r-- | qa/spec/spec_helper.rb | 3 |
1 files changed, 2 insertions, 1 deletions
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 |