Add latest changes from gitlab-org/gitlab@master

1 files changed, 6 insertions, 1 deletions

diff --git a/qa/qa/support/retrier.rb b/qa/qa/support/retrier.rb
index 720f1d17037..3b02cb4855b 100644
--- a/qa/qa/support/retrier.rb
+++ b/qa/qa/support/retrier.rb
@@ -24,7 +24,7 @@ module QA
         end
       end
 
-      def retry_until(max_attempts: 3, reload_page: nil, sleep_interval: 0)
+      def retry_until(max_attempts: 3, reload_page: nil, sleep_interval: 0, exit_on_failure: false)
         QA::Runtime::Logger.debug("with retry_until: max_attempts #{max_attempts}; sleep_interval #{sleep_interval}; reload_page:#{reload_page}")
         attempts = 0
 
@@ -40,6 +40,11 @@ module QA
           attempts += 1
         end
 
+        if exit_on_failure
+          QA::Runtime::Logger.debug("Raising exception after #{max_attempts} attempts")
+          raise
+        end
+
         false
       end
     end