Merge branch 'qa-retry-in-ci-only' into 'master'

Only retry failing QA tests in CI

See merge request gitlab-org/gitlab-ce!28163

1 files changed, 5 insertions, 3 deletions

diff --git a/qa/spec/spec_helper.rb b/qa/spec/spec_helper.rb
index 24ff1523ba7..a368ffba711 100644
--- a/qa/spec/spec_helper.rb
+++ b/qa/spec/spec_helper.rb
@@ -35,8 +35,10 @@ RSpec.configure do |config|
   # show exception that triggers a retry if verbose_retry is set to true
   config.display_try_failure_messages = true
 
-  config.around do |example|
-    retry_times = example.metadata.keys.include?(:quarantine) ? 1 : 2
-    example.run_with_retry retry: retry_times
+  if ENV['CI']
+    config.around do |example|
+      retry_times = example.metadata.keys.include?(:quarantine) ? 1 : 2
+      example.run_with_retry retry: retry_times
+    end
   end
 end