diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-03 12:09:09 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-03 12:09:09 +0300 |
| commit | c384315ae1ea48df2a741874b326581ded0a97e1 (patch) | |
| tree | 6f50dfdb7fb726ef3e738dc5264526cf683906a3 /qa/spec | |
| parent | e1e017ddc4d64e4777bbe663c555093a7ae0cca3 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'qa/spec')
| -rw-r--r-- | qa/spec/spec_helper.rb | 2 |
1 files changed, 1 insertions, 1 deletions
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 |