Merge branch 'qa-ml-retry-first-login-validation' into 'master'

[CE] Retry the first login page validation

Closes gitlab-org/quality/nightly#103

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

1 files changed, 9 insertions, 0 deletions

diff --git a/qa/qa/ce/strategy.rb b/qa/qa/ce/strategy.rb
index 7e2d02424fe..6c1820ffdc8 100644
--- a/qa/qa/ce/strategy.rb
+++ b/qa/qa/ce/strategy.rb
@@ -10,9 +10,18 @@ module QA
       end
 
       def perform_before_hooks
+        retries ||= 0
+
         # The login page could take some time to load the first time it is visited.
         # We visit the login page and wait for it to properly load only once before the tests.
         QA::Runtime::Browser.visit(:gitlab, QA::Page::Main::Login)
+      rescue QA::Page::Validatable::PageValidationError
+        if (retries += 1) < 3
+          Runtime::Logger.warn("The login page did not appear as expected. Retrying... (attempt ##{retries})")
+          retry
+        end
+
+        raise
       end
     end
   end