diff options
| author | Mayra Cabrera <mcabrera@gitlab.com> | 2018-07-31 13:15:18 +0000 |
|---|---|---|
| committer | Mayra Cabrera <mcabrera@gitlab.com> | 2018-07-31 13:15:18 +0000 |
| commit | b21730116ea14fc1ac153478ed058e505bceed17 (patch) | |
| tree | b3c6c481f1a3368ad13cb2b1471b94a4b1034965 /qa | |
| parent | 5a3948a5733d7d4dc09bfa2daeaad5cc15ba2a00 (diff) | |
| download | gitlab-ce-b21730116ea14fc1ac153478ed058e505bceed17.tar.gz | |
Revert "Merge branch '48098-mutual-auth-cluster-applications' into 'master'"
This reverts merge request !20801
Diffstat (limited to 'qa')
| -rw-r--r-- | qa/qa/factory/resource/kubernetes_cluster.rb | 5 | ||||
| -rw-r--r-- | qa/qa/page/project/operations/kubernetes/show.rb | 1 |
2 files changed, 2 insertions, 4 deletions
diff --git a/qa/qa/factory/resource/kubernetes_cluster.rb b/qa/qa/factory/resource/kubernetes_cluster.rb index ef2ea72b170..1c9e5f94b22 100644 --- a/qa/qa/factory/resource/kubernetes_cluster.rb +++ b/qa/qa/factory/resource/kubernetes_cluster.rb @@ -44,11 +44,10 @@ module QA page.await_installed(:helm) page.install!(:ingress) if @install_ingress - page.install!(:prometheus) if @install_prometheus - page.install!(:runner) if @install_runner - page.await_installed(:ingress) if @install_ingress + page.install!(:prometheus) if @install_prometheus page.await_installed(:prometheus) if @install_prometheus + page.install!(:runner) if @install_runner page.await_installed(:runner) if @install_runner end end diff --git a/qa/qa/page/project/operations/kubernetes/show.rb b/qa/qa/page/project/operations/kubernetes/show.rb index e831edeb89e..4923304133e 100644 --- a/qa/qa/page/project/operations/kubernetes/show.rb +++ b/qa/qa/page/project/operations/kubernetes/show.rb @@ -16,7 +16,6 @@ module QA def install!(application_name) within(".js-cluster-application-row-#{application_name}") do - page.has_button?('Install', wait: 30) click_on 'Install' end end |