From 9985486e34f547323afb8577a24ac4949f2cafd3 Mon Sep 17 00:00:00 2001 From: ddavison Date: Tue, 26 Feb 2019 14:13:42 -0800 Subject: Pare down create_project_with_auto_devops_spec For now only test RBAC disabled Remove superfluous statements that waste time Signed-off-by: ddavison --- .../create_project_with_auto_devops_spec.rb | 241 ++++++++++----------- 1 file changed, 113 insertions(+), 128 deletions(-) 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 02bd378acfc..c0cac5508bd 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 @@ -11,163 +11,148 @@ module QA end describe 'Auto DevOps support', :orchestrated, :kubernetes, :quarantine do - [true, false].each do |rbac| - context "when rbac is #{rbac ? 'enabled' : 'disabled'}" do - before(:all) do - login - - @project = Resource::Project.fabricate! 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.project = @project - resource.key = 'CODE_QUALITY_DISABLED' - resource.value = '1' - end + context 'when rbac is enabled' do + before(:all) do + login - # Create Auto DevOps compatible repo - Resource::Repository::ProjectPush.fabricate! do |push| - push.project = @project - push.directory = Pathname - .new(__dir__) - .join('../../../../../fixtures/auto_devops_rack') - push.commit_message = 'Create Auto DevOps compatible rack application' - end - - # Create and connect K8s cluster - @cluster = Service::KubernetesCluster.new(rbac: rbac).create! - Resource::KubernetesCluster.fabricate! do |cluster| - cluster.project = @project - cluster.cluster = @cluster - cluster.install_helm_tiller = true - cluster.install_ingress = true - cluster.install_prometheus = true - cluster.install_runner = true - end + @project = Resource::Project.fabricate! do |p| + p.name = Runtime::Env.auto_devops_project_name || 'project-with-autodevops' + p.description = 'Project with Auto DevOps' + end - @project.visit! - Page::Project::Menu.perform(&:click_ci_cd_settings) - Page::Project::Settings::CICD.perform do |p| - p.enable_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.project = @project + resource.key = 'CODE_QUALITY_DISABLED' + resource.value = '1' end - after(:all) do - @cluster&.remove! + # Create Auto DevOps compatible repo + Resource::Repository::ProjectPush.fabricate! do |push| + push.project = @project + push.directory = Pathname + .new(__dir__) + .join('../../../../../fixtures/auto_devops_rack') + push.commit_message = 'Create Auto DevOps compatible rack application' end - before do - login + # Create and connect K8s cluster + @cluster = Service::KubernetesCluster.new(rbac: true).create! + Resource::KubernetesCluster.fabricate! do |cluster| + cluster.project = @project + cluster.cluster = @cluster + cluster.install_helm_tiller = true + cluster.install_ingress = true + cluster.install_prometheus = true + cluster.install_runner = true end + end - it 'runs auto devops' do - @project.visit! - Page::Project::Menu.perform(&:click_ci_cd_pipelines) - Page::Project::Pipeline::Index.perform(&:go_to_latest_pipeline) + after(:all) do + @cluster&.remove! + end - Page::Project::Pipeline::Show.perform do |pipeline| - pipeline.go_to_job('build') - end - Page::Project::Job::Show.perform do |job| - expect(job).to be_successful(timeout: 600) + it 'runs auto devops' do + @project.visit! + Page::Project::Menu.perform(&:click_ci_cd_pipelines) + Page::Project::Pipeline::Index.perform(&:go_to_latest_pipeline) - job.click_element(:pipeline_path) - end + Page::Project::Pipeline::Show.perform do |pipeline| + pipeline.go_to_job('build') + end + Page::Project::Job::Show.perform do |job| + expect(job).to be_successful(timeout: 600) - Page::Project::Pipeline::Show.perform do |pipeline| - pipeline.go_to_job('test') - end - Page::Project::Job::Show.perform do |job| - expect(job).to be_successful(timeout: 600) + job.click_element(:pipeline_path) + end - job.click_element(:pipeline_path) - end + Page::Project::Pipeline::Show.perform do |pipeline| + pipeline.go_to_job('test') + end + Page::Project::Job::Show.perform do |job| + expect(job).to be_successful(timeout: 600) - Page::Project::Pipeline::Show.perform do |pipeline| - pipeline.go_to_job('production') - end - Page::Project::Job::Show.perform do |job| - expect(job).to be_successful(timeout: 1200) + job.click_element(:pipeline_path) + end - job.click_element(:pipeline_path) - end + Page::Project::Pipeline::Show.perform do |pipeline| + pipeline.go_to_job('production') + end + Page::Project::Job::Show.perform do |job| + expect(job).to be_successful(timeout: 1200) - Page::Project::Menu.perform(&:click_operations_environments) - Page::Project::Operations::Environments::Index.perform do |index| - index.go_to_environment('production') - end - Page::Project::Operations::Environments::Show.perform do |show| - show.view_deployment do - expect(page).to have_content('Hello World!') - end - end + job.click_element(:pipeline_path) end - it 'user sets application secret variable and Auto DevOps passes it to container' do - # Set an application secret CI variable (prefixed with K8S_SECRET_) - Resource::CiVariable.fabricate! do |resource| - resource.project = @project - resource.key = 'K8S_SECRET_OPTIONAL_MESSAGE' - resource.value = 'You can see this application secret' + Page::Project::Menu.perform(&:click_operations_environments) + Page::Project::Operations::Environments::Index.perform do |index| + index.go_to_environment('production') + end + Page::Project::Operations::Environments::Show.perform do |show| + show.view_deployment do + expect(page).to have_content('Hello World!') end + end + end - # Our current Auto DevOps implementation won't update the production - # app if we only update a CI variable with no code change. - # - # Workaround: push new code and use the resultant pipeline. - Resource::Repository::ProjectPush.fabricate! do |push| - push.project = @project - push.commit_message = 'Force a Deployment change by pushing new code' - push.file_name = 'new_file.txt' - push.file_content = 'new file contents' - end + it 'user sets application secret variable and Auto DevOps passes it to container' do + # Set an application secret CI variable (prefixed with K8S_SECRET_) + Resource::CiVariable.fabricate! do |resource| + resource.project = @project + resource.key = 'K8S_SECRET_OPTIONAL_MESSAGE' + resource.value = 'You can see this application secret' + end - @project.visit! - Page::Project::Menu.perform(&:click_ci_cd_pipelines) - Page::Project::Pipeline::Index.perform(&:go_to_latest_pipeline) + # Our current Auto DevOps implementation won't update the production + # app if we only update a CI variable with no code change. + # + # Workaround: push new code and use the resultant pipeline. + Resource::Repository::ProjectPush.fabricate! do |push| + push.project = @project + push.commit_message = 'Force a Deployment change by pushing new code' + push.file_name = 'new_file.txt' + push.file_content = 'new file contents' + end - Page::Project::Pipeline::Show.perform do |pipeline| - pipeline.go_to_job('build') - end - Page::Project::Job::Show.perform do |job| - expect(job).to be_successful(timeout: 600) + Page::Project::Menu.perform(&:click_ci_cd_pipelines) + Page::Project::Pipeline::Index.perform(&:go_to_latest_pipeline) - job.click_element(:pipeline_path) - end + Page::Project::Pipeline::Show.perform do |pipeline| + pipeline.go_to_job('build') + end + Page::Project::Job::Show.perform do |job| + expect(job).to be_successful(timeout: 600) - Page::Project::Pipeline::Show.perform do |pipeline| - pipeline.go_to_job('test') - end - Page::Project::Job::Show.perform do |job| - expect(job).to be_successful(timeout: 600) + job.click_element(:pipeline_path) + end - job.click_element(:pipeline_path) - end + Page::Project::Pipeline::Show.perform do |pipeline| + pipeline.go_to_job('test') + end + Page::Project::Job::Show.perform do |job| + expect(job).to be_successful(timeout: 600) - Page::Project::Pipeline::Show.perform do |pipeline| - pipeline.go_to_job('production') - end - Page::Project::Job::Show.perform do |job| - expect(job).to be_successful(timeout: 1200) + job.click_element(:pipeline_path) + end - job.click_element(:pipeline_path) - end + Page::Project::Pipeline::Show.perform do |pipeline| + pipeline.go_to_job('production') + end + Page::Project::Job::Show.perform do |job| + expect(job).to be_successful(timeout: 1200) + end - Page::Project::Menu.perform(&:click_operations_environments) + Page::Project::Menu.perform(&:click_operations_environments) - Page::Project::Operations::Environments::Index.perform do |index| - index.go_to_environment('production') - end + Page::Project::Operations::Environments::Index.perform do |index| + index.go_to_environment('production') + end - Page::Project::Operations::Environments::Show.perform do |show| - show.view_deployment do - expect(page).to have_content('Hello World!') - expect(page).to have_content('You can see this application secret') - end + Page::Project::Operations::Environments::Show.perform do |show| + show.view_deployment do + expect(page).to have_content('Hello World!') + expect(page).to have_content('You can see this application secret') end end end -- cgit v1.2.1 From 91d29c5547161fcdeeab4e50adc1e0e0f07aa1de Mon Sep 17 00:00:00 2001 From: ddavison Date: Wed, 27 Feb 2019 12:06:02 -0800 Subject: Default rbac to true for the KubernetesCluster Service Signed-off-by: ddavison --- qa/qa/service/kubernetes_cluster.rb | 2 +- .../7_configure/auto_devops/create_project_with_auto_devops_spec.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/qa/qa/service/kubernetes_cluster.rb b/qa/qa/service/kubernetes_cluster.rb index c5f12255d72..41ab702d8b2 100644 --- a/qa/qa/service/kubernetes_cluster.rb +++ b/qa/qa/service/kubernetes_cluster.rb @@ -9,7 +9,7 @@ module QA attr_reader :api_url, :ca_certificate, :token, :rbac - def initialize(rbac: false) + def initialize(rbac: true) @rbac = rbac 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 c0cac5508bd..2aa386f35ce 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 @@ -38,7 +38,7 @@ module QA end # Create and connect K8s cluster - @cluster = Service::KubernetesCluster.new(rbac: true).create! + @cluster = Service::KubernetesCluster.new.create! Resource::KubernetesCluster.fabricate! do |cluster| cluster.project = @project cluster.cluster = @cluster -- cgit v1.2.1