diff options
| author | Mark Lapierre <mlapierre@gitlab.com> | 2019-01-25 22:32:21 +0000 |
|---|---|---|
| committer | Mark Lapierre <mlapierre@gitlab.com> | 2019-01-25 22:32:21 +0000 |
| commit | c2b3f64cb44114e69ddeeb453412ad4dd762baf9 (patch) | |
| tree | f077a976da54630215453c8cb7d76a57831965a1 | |
| parent | 5f6f0cd6956db1349234ea1aea47776dffb2cfe4 (diff) | |
| parent | 7a89575d18167f04949c49353e05fa0c923aaa94 (diff) | |
| download | gitlab-ce-docs/add-note-on-redis-backup-restore.tar.gz | |
Merge branch 'increase-kubernetes-ip-address-timeout' into 'master'docs/add-note-on-redis-backup-restore
Auto DevOps QA: increase IP address timeout, remove quarantine
Closes gitlab-qa#369
See merge request gitlab-org/gitlab-ce!24687
| -rw-r--r-- | qa/qa/page/project/operations/kubernetes/show.rb | 2 | ||||
| -rw-r--r-- | qa/qa/specs/features/browser_ui/7_configure/auto_devops/create_project_with_auto_devops_spec.rb | 5 |
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) |