diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-08-20 18:42:06 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-08-20 18:42:06 +0000 |
commit | 6e4e1050d9dba2b7b2523fdd1768823ab85feef4 (patch) | |
tree | 78be5963ec075d80116a932011d695dd33910b4e /qa/qa/specs/features/browser_ui/8_monitor/all_monitor_core_features_spec.rb | |
parent | 1ce776de4ae122aba3f349c02c17cebeaa8ecf07 (diff) | |
download | gitlab-ce-6e4e1050d9dba2b7b2523fdd1768823ab85feef4.tar.gz |
Add latest changes from gitlab-org/gitlab@13-3-stable-ee
Diffstat (limited to 'qa/qa/specs/features/browser_ui/8_monitor/all_monitor_core_features_spec.rb')
-rw-r--r-- | qa/qa/specs/features/browser_ui/8_monitor/all_monitor_core_features_spec.rb | 21 |
1 files changed, 7 insertions, 14 deletions
diff --git a/qa/qa/specs/features/browser_ui/8_monitor/all_monitor_core_features_spec.rb b/qa/qa/specs/features/browser_ui/8_monitor/all_monitor_core_features_spec.rb index 9cfdc4277a7..54c7b75d1d1 100644 --- a/qa/qa/specs/features/browser_ui/8_monitor/all_monitor_core_features_spec.rb +++ b/qa/qa/specs/features/browser_ui/8_monitor/all_monitor_core_features_spec.rb @@ -2,12 +2,13 @@ module QA RSpec.describe 'Monitor' do - describe 'with Prometheus in a Gitlab-managed cluster', :orchestrated, :kubernetes do + describe 'with Prometheus in a Gitlab-managed cluster', :orchestrated, :kubernetes, :requires_admin do before :all do - @cluster = Service::KubernetesCluster.new.create! + @cluster = Service::KubernetesCluster.new(provider_class: Service::ClusterProvider::K3s).create! @project = Resource::Project.fabricate_via_api! do |project| project.name = 'monitoring-project' project.auto_devops_enabled = true + project.template_name = 'express' end deploy_project_with_prometheus @@ -83,7 +84,7 @@ module QA %w[ CODE_QUALITY_DISABLED TEST_DISABLED LICENSE_MANAGEMENT_DISABLED SAST_DISABLED DAST_DISABLED DEPENDENCY_SCANNING_DISABLED - CONTAINER_SCANNING_DISABLED PERFORMANCE_DISABLED + CONTAINER_SCANNING_DISABLED PERFORMANCE_DISABLED SECRET_DETECTION_DISABLED ].each do |key| Resource::CiVariable.fabricate_via_api! do |resource| resource.project = @project @@ -98,22 +99,14 @@ module QA Resource::KubernetesCluster::ProjectCluster.fabricate! do |cluster_settings| cluster_settings.project = @project cluster_settings.cluster = @cluster - cluster_settings.install_helm_tiller = true cluster_settings.install_runner = true cluster_settings.install_ingress = true cluster_settings.install_prometheus = true end - Resource::Repository::ProjectPush.fabricate! do |push| - push.project = @project - push.directory = Pathname - .new(__dir__) - .join('../../../../fixtures/auto_devops_rack') - push.commit_message = 'Create AutoDevOps compatible Project for Monitoring' - end - - Page::Project::Menu.perform(&:click_ci_cd_pipelines) - Page::Project::Pipeline::Index.perform(&:click_on_latest_pipeline) + Resource::Pipeline.fabricate_via_api! do |pipeline| + pipeline.project = @project + end.visit! Page::Project::Pipeline::Show.perform do |pipeline| pipeline.click_job('build') |