Automatic merge of gitlab-org/gitlab-ce master

qa/qa/page/project/operations/kubernetes/show.rb

@@ -30,7 +30,7 @@ module QA
             def ingress_ip
               # We need to wait longer since it can take some time before the
               # ip address is assigned for the ingress controller
-              page.find('#ingress-ip-address', wait: 500).value
+              page.find('#ingress-ip-address', wait: 1200).value
             end
           end
         end

qa/qa/specs/features/browser_ui/7_configure/auto_devops/create_project_with_auto_devops_spec.rb

@@ -3,10 +3,7 @@
 require 'pathname'
 
 module QA
-  # Issues for transient failure:
-  # https://gitlab.com/gitlab-org/quality/nightly/issues/40
-  # https://gitlab.com/gitlab-org/quality/nightly/issues/61
-  context 'Configure', :orchestrated, :kubernetes, :quarantine do
+  context 'Configure', :orchestrated, :kubernetes do
     describe 'Auto DevOps support' do
       def login
         Runtime::Browser.visit(:gitlab, Page::Main::Login)