Commit 8b30406a authored by Dan Davison's avatar Dan Davison

Merge branch '58503-fix-qa-auto-devops' into 'master'

Fix QA Auto DevOps push after adding cluster

Closes #58503

See merge request gitlab-org/gitlab-ce!25782
parents 773989c6 e8df3ab8
...@@ -28,15 +28,6 @@ module QA ...@@ -28,15 +28,6 @@ module QA
resource.value = '1' resource.value = '1'
end end
# 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 # Create and connect K8s cluster
@cluster = Service::KubernetesCluster.new.create! @cluster = Service::KubernetesCluster.new.create!
Resource::KubernetesCluster.fabricate! do |cluster| Resource::KubernetesCluster.fabricate! do |cluster|
...@@ -47,6 +38,15 @@ module QA ...@@ -47,6 +38,15 @@ module QA
cluster.install_prometheus = true cluster.install_prometheus = true
cluster.install_runner = true cluster.install_runner = true
end end
# 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
end end
after(:all) do after(:all) do
......
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