summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDylan Griffith <dyl.griffith@gmail.com>2019-01-25 20:26:54 +0000
committerDylan Griffith <dyl.griffith@gmail.com>2019-01-25 20:26:54 +0000
commit7a89575d18167f04949c49353e05fa0c923aaa94 (patch)
tree953f4fa6e9fc770af1143e26aa1ecb044d9e210a
parent1d0580d4dca8133efe8b6035ead4455e7b1b40c5 (diff)
downloadgitlab-ce-7a89575d18167f04949c49353e05fa0c923aaa94.tar.gz
Auto DevOps QA: increase IP address timeout, remove quarantine
-rw-r--r--qa/qa/page/project/operations/kubernetes/show.rb2
-rw-r--r--qa/qa/specs/features/browser_ui/7_configure/auto_devops/create_project_with_auto_devops_spec.rb5
2 files changed, 2 insertions, 5 deletions
diff --git a/qa/qa/page/project/operations/kubernetes/show.rb b/qa/qa/page/project/operations/kubernetes/show.rb
index 9e8f9ba79d7..98ac5c32d91 100644
--- a/qa/qa/page/project/operations/kubernetes/show.rb
+++ b/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
diff --git a/qa/qa/specs/features/browser_ui/7_configure/auto_devops/create_project_with_auto_devops_spec.rb b/qa/qa/specs/features/browser_ui/7_configure/auto_devops/create_project_with_auto_devops_spec.rb
index 7283468d66b..5147b17d7ab 100644
--- a/qa/qa/specs/features/browser_ui/7_configure/auto_devops/create_project_with_auto_devops_spec.rb
+++ b/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)