diff options
| -rw-r--r-- | qa/qa/resource/kubernetes_cluster.rb | 19 | ||||
| -rw-r--r-- | qa/qa/specs/features/browser_ui/7_configure/auto_devops/create_project_with_auto_devops_spec.rb | 8 |
2 files changed, 17 insertions, 10 deletions
diff --git a/qa/qa/resource/kubernetes_cluster.rb b/qa/qa/resource/kubernetes_cluster.rb index 1dd93dd5b88..cc5e3cd872d 100644 --- a/qa/qa/resource/kubernetes_cluster.rb +++ b/qa/qa/resource/kubernetes_cluster.rb @@ -42,13 +42,20 @@ module QA page.install!(:helm) page.await_installed(:helm) - page.install!(:ingress) if @install_ingress - page.install!(:prometheus) if @install_prometheus - page.install!(:runner) if @install_runner + if @install_ingress + page.install!(:ingress) if @install_ingress + page.await_installed(:ingress) if @install_ingress + end - page.await_installed(:ingress) if @install_ingress - page.await_uninstallable(:prometheus) if @install_prometheus - page.await_installed(:runner) if @install_runner + if @install_prometheus + page.install!(:prometheus) + page.await_uninstallable(:prometheus) if @install_prometheus + end + + if @install_runner + page.install!(:runner) + page.await_installed(:runner) + end if @install_ingress populate(:ingress_ip) 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 5ca9ddb6b19..d860250b6d7 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 @@ -23,14 +23,14 @@ module QA it 'runs auto devops' do login - @project = Resource::Project.fabricate! do |p| + @project = Resource::Project.fabricate_via_api! do |p| p.name = Runtime::Env.auto_devops_project_name || 'project-with-autodevops' p.description = 'Project with Auto DevOps' end # Disable code_quality check in Auto DevOps pipeline as it takes # too long and times out the test - Resource::CiVariable.fabricate! do |resource| + Resource::CiVariable.fabricate_via_api! do |resource| resource.project = @project resource.key = 'CODE_QUALITY_DISABLED' resource.value = '1' @@ -38,7 +38,7 @@ module QA end # Set an application secret CI variable (prefixed with K8S_SECRET_) - Resource::CiVariable.fabricate! do |resource| + Resource::CiVariable.fabricate_via_api! do |resource| resource.project = @project resource.key = 'K8S_SECRET_OPTIONAL_MESSAGE' resource.value = 'you_can_see_this_variable' @@ -46,7 +46,7 @@ module QA end # Connect K8s cluster - Resource::KubernetesCluster.fabricate! do |cluster| + Resource::KubernetesCluster.fabricate_via_browser_ui! do |cluster| cluster.project = @project cluster.cluster = @cluster cluster.install_helm_tiller = true |