Commit 420fb032 authored by Kamil Trzciński's avatar Kamil Trzciński

Merge branch 'fix-qa-auto-devops-before-all' into 'master'

Fix QA spec sharing project in the wrong context

Closes gitlab-org/quality/nightly#54

See merge request gitlab-org/gitlab-ce!24183
parents aba4624a d322b221
...@@ -10,12 +10,14 @@ module QA ...@@ -10,12 +10,14 @@ module QA
Page::Main::Login.act { sign_in_using_credentials } Page::Main::Login.act { sign_in_using_credentials }
end end
[true, false].each do |rbac|
context "when rbac is #{rbac ? 'enabled' : 'disabled'}" do
before(:all) do before(:all) do
login login
@project = Resource::Project.fabricate! do |p| @project = Resource::Project.fabricate! do |p|
p.name = Runtime::Env.auto_devops_project_name || 'project-with-autodevops' p.name = Runtime::Env.auto_devops_project_name || 'project-with-autodevops'
p.description = 'Project with Auto Devops' p.description = 'Project with Auto DevOps'
end end
# Disable code_quality check in Auto DevOps pipeline as it takes # Disable code_quality check in Auto DevOps pipeline as it takes
...@@ -26,7 +28,7 @@ module QA ...@@ -26,7 +28,7 @@ module QA
resource.value = '1' resource.value = '1'
end end
# Create Auto Devops compatible repo # Create Auto DevOps compatible repo
Resource::Repository::ProjectPush.fabricate! do |push| Resource::Repository::ProjectPush.fabricate! do |push|
push.project = @project push.project = @project
push.directory = Pathname push.directory = Pathname
...@@ -36,11 +38,7 @@ module QA ...@@ -36,11 +38,7 @@ module QA
end end
Page::Project::Show.act { wait_for_push } Page::Project::Show.act { wait_for_push }
end
[true, false].each do |rbac|
context "when rbac is #{rbac ? 'enabled' : 'disabled'}" do
before(:all) do
# Create and connect K8s cluster # Create and connect K8s cluster
@cluster = Service::KubernetesCluster.new(rbac: rbac).create! @cluster = Service::KubernetesCluster.new(rbac: rbac).create!
kubernetes_cluster = Resource::KubernetesCluster.fabricate! do |cluster| kubernetes_cluster = Resource::KubernetesCluster.fabricate! do |cluster|
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment