diff options
Diffstat (limited to 'qa')
3 files changed, 14 insertions, 11 deletions
diff --git a/qa/qa/specs/features/browser_ui/4_verify/pipeline/create_and_process_pipeline_spec.rb b/qa/qa/specs/features/browser_ui/4_verify/pipeline/create_and_process_pipeline_spec.rb index 05adcc718e8..2502e8beda7 100644 --- a/qa/qa/specs/features/browser_ui/4_verify/pipeline/create_and_process_pipeline_spec.rb +++ b/qa/qa/specs/features/browser_ui/4_verify/pipeline/create_and_process_pipeline_spec.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true module QA - context 'Verify', :docker do + context 'Verify', :docker, :runner do describe 'Pipeline creation and processing' do let(:executor) { "qa-runner-#{Time.now.to_i}" } let(:max_wait) { 30 } @@ -12,7 +12,7 @@ module QA end end - before do + let!(:runner) do Resource::Runner.fabricate! do |runner| runner.project = project runner.name = executor @@ -21,7 +21,7 @@ module QA end after do - Service::DockerRun::GitlabRunner.new(executor).remove! + runner.remove_via_api! end it 'users creates a pipeline which gets processed', :smoke do diff --git a/qa/qa/specs/features/browser_ui/4_verify/runner/register_runner_spec.rb b/qa/qa/specs/features/browser_ui/4_verify/runner/register_runner_spec.rb index fb1ee4446a9..2550ee7193b 100644 --- a/qa/qa/specs/features/browser_ui/4_verify/runner/register_runner_spec.rb +++ b/qa/qa/specs/features/browser_ui/4_verify/runner/register_runner_spec.rb @@ -1,20 +1,23 @@ # frozen_string_literal: true module QA - context 'Verify', :docker do + context 'Verify', :docker, :runner do describe 'Runner registration' do let(:executor) { "qa-runner-#{Time.now.to_i}" } + let!(:runner) do + Resource::Runner.fabricate! do |runner| + runner.name = executor + end + end after do - Service::DockerRun::GitlabRunner.new(executor).remove! + runner.remove_via_api! end it 'user registers a new specific runner' do Flow::Login.sign_in - Resource::Runner.fabricate! do |runner| - runner.name = executor - end.project.visit! + runner.project.visit! Page::Project::Menu.perform(&:go_to_ci_cd_settings) Page::Project::Settings::CICD.perform do |settings| diff --git a/qa/qa/specs/features/browser_ui/6_release/deploy_key/clone_using_deploy_key_spec.rb b/qa/qa/specs/features/browser_ui/6_release/deploy_key/clone_using_deploy_key_spec.rb index 581e6b8299e..73f2fef5f1d 100644 --- a/qa/qa/specs/features/browser_ui/6_release/deploy_key/clone_using_deploy_key_spec.rb +++ b/qa/qa/specs/features/browser_ui/6_release/deploy_key/clone_using_deploy_key_spec.rb @@ -3,7 +3,7 @@ require 'digest/sha1' module QA - context 'Release', :docker do + context 'Release', :docker, :runner do describe 'Git clone using a deploy key' do before do Flow::Login.sign_in @@ -16,7 +16,7 @@ module QA @repository_location = @project.repository_ssh_location - Resource::Runner.fabricate_via_api! do |resource| + @runner = Resource::Runner.fabricate_via_api! do |resource| resource.project = @project resource.name = @runner_name resource.tags = %w[qa docker] @@ -25,7 +25,7 @@ module QA end after do - Service::DockerRun::GitlabRunner.new(@runner_name).remove! + @runner.remove_via_api! end keys = [ |