WIP: Setup for testing runner helm chartchart-runner-test

4 files changed, 13 insertions, 25 deletions

diff --git a/app/models/clusters/applications/runner.rb b/app/models/clusters/applications/runner.rb
index b881b4eaf36..ddcde797bd5 100644
--- a/app/models/clusters/applications/runner.rb
+++ b/app/models/clusters/applications/runner.rb
@@ -15,7 +15,7 @@ module Clusters
       default_value_for :version, VERSION
 
       def chart
-        "#{name}/gitlab-runner"
+        "https://gitlab.com/charts/gitlab-runner/-/archive/namespace-helper-functions/gitlab-runner-master.tar.gz"
       end
 
       def repository
diff --git a/qa/qa/factory/resource/kubernetes_cluster.rb b/qa/qa/factory/resource/kubernetes_cluster.rb
index 9bd3d0baa08..748a0c5aff2 100644
--- a/qa/qa/factory/resource/kubernetes_cluster.rb
+++ b/qa/qa/factory/resource/kubernetes_cluster.rb
@@ -9,9 +9,9 @@ module QA
           :install_helm_tiller, :install_ingress, :install_prometheus, :install_runner
 
         product :ingress_ip do
-          Page::Project::Operations::Kubernetes::Show.perform do |page|
-            page.ingress_ip
-          end
+         # Page::Project::Operations::Kubernetes::Show.perform do |page|
+         #   page.ingress_ip
+         # end
         end
 
         def fabricate!
diff --git a/qa/qa/fixtures/auto_devops_rack/delete_me-ci.yml b/qa/qa/fixtures/auto_devops_rack/delete_me-ci.yml
new file mode 100644
index 00000000000..b235cd566cd
--- /dev/null
+++ b/qa/qa/fixtures/auto_devops_rack/delete_me-ci.yml
@@ -0,0 +1,3 @@
+job1:
+  script:
+    - echo hello run k8s runner
diff --git a/qa/qa/specs/features/project/auto_devops_spec.rb b/qa/qa/specs/features/project/auto_devops_spec.rb
index 360a6f3552d..f87b13612f3 100644
--- a/qa/qa/specs/features/project/auto_devops_spec.rb
+++ b/qa/qa/specs/features/project/auto_devops_spec.rb
@@ -7,12 +7,14 @@ module QA
     end
 
     scenario 'user creates a new project and runs auto devops' do
+      @cluster = Service::KubernetesCluster.new.create!
+      require 'pry'; binding.pry
       Runtime::Browser.visit(:gitlab, Page::Main::Login)
       Page::Main::Login.act { sign_in_using_credentials }
 
       project = Factory::Resource::Project.fabricate! do |p|
-        p.name = 'project-with-autodevops'
-        p.description = 'Project with Auto Devops'
+        p.name = 'project-with-k8s-runner'
+        p.description = 'Project with K8s Runner'
       end
 
       # Create Auto Devops compatible repo
@@ -28,10 +30,7 @@ module QA
         repository.configure_identity('GitLab QA', 'root@gitlab.com')
 
         repository.checkout_new_branch('master')
-        repository.add_file('config.ru', File.read(File.join(__dir__, "../../../fixtures/auto_devops_rack/config.ru")))
-        repository.add_file('Gemfile', File.read(File.join(__dir__, "../../../fixtures/auto_devops_rack/Gemfile")))
-        repository.add_file('Gemfile.lock', File.read(File.join(__dir__, "../../../fixtures/auto_devops_rack/Gemfile.lock")))
-        repository.add_file('Rakefile', File.read(File.join(__dir__, "../../../fixtures/auto_devops_rack/Rakefile")))
+        repository.add_file('.gitlab-ci.yml', File.read(File.join(__dir__, "../../../fixtures/auto_devops_rack/delete_me-ci.yml")))
         repository.commit('Create auto devops repo')
         repository.push_changes("master:master")
       end
@@ -42,28 +41,14 @@ module QA
         c.project = project
         c.cluster = @cluster
         c.install_helm_tiller = true
-        c.install_ingress = true
-        c.install_prometheus = true
         c.install_runner = true
       end
 
       project.visit!
-      Page::Menu::Side.act { click_ci_cd_settings }
-      Page::Project::Settings::CICD.perform do |p|
-        p.enable_auto_devops_with_domain("#{kubernetes_cluster.ingress_ip}.nip.io")
-      end
-
-      project.visit!
       Page::Menu::Side.act { click_ci_cd_pipelines }
       Page::Project::Pipeline::Index.act { go_to_latest_pipeline }
 
-      Page::Project::Pipeline::Show.perform do |pipeline|
-        expect(pipeline).to have_build('build', status: :success, wait: 600)
-        expect(pipeline).to have_build('test', status: :success, wait: 600)
-        expect(pipeline).to have_build('sast', status: :success, wait: 600)
-        expect(pipeline).to have_build('production', status: :success, wait: 600)
-        expect(pipeline).to have_build('performance', status: :success, wait: 600)
-      end
+      require 'pry'; binding.pry
     end
   end
 end