diff options
author | Dan Davison <ddavison@gitlab.com> | 2019-03-05 22:52:23 +0000 |
---|---|---|
committer | Dan Davison <ddavison@gitlab.com> | 2019-03-05 22:52:23 +0000 |
commit | 8b30406af6223d2efd7f98b91f95182e694f9176 (patch) | |
tree | cf0aa98d8c19c4df69e5aae45c2c972414813ca2 /qa | |
parent | 773989c6299077a2e0b90700bc45f2071570bb66 (diff) | |
parent | e8df3ab8cd03fab327d5b0c01edebc0fd4607008 (diff) | |
download | gitlab-ce-8b30406af6223d2efd7f98b91f95182e694f9176.tar.gz |
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
Diffstat (limited to 'qa')
-rw-r--r-- | qa/qa/specs/features/browser_ui/7_configure/auto_devops/create_project_with_auto_devops_spec.rb | 18 |
1 files changed, 9 insertions, 9 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 2aa386f35ce..4212a2b0392 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 @@ -28,15 +28,6 @@ module QA resource.value = '1' 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 @cluster = Service::KubernetesCluster.new.create! Resource::KubernetesCluster.fabricate! do |cluster| @@ -47,6 +38,15 @@ module QA cluster.install_prometheus = true cluster.install_runner = true 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 after(:all) do |