summaryrefslogtreecommitdiff
path: root/qa/qa/resource
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2019-10-14 03:06:12 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2019-10-14 03:06:12 +0000
commit934c2d5cf060d5f9881b18a2ddfbc32acea98995 (patch)
tree0171c75a2bcab42bd94dd105383750779dcf0e86 /qa/qa/resource
parent7ea2b8726c5c587e32d53efd5d9c84cd72ba4356 (diff)
downloadgitlab-ce-934c2d5cf060d5f9881b18a2ddfbc32acea98995.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'qa/qa/resource')
-rw-r--r--qa/qa/resource/runner.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/qa/qa/resource/runner.rb b/qa/qa/resource/runner.rb
index 3f0eed7458a..1be2429bc04 100644
--- a/qa/qa/resource/runner.rb
+++ b/qa/qa/resource/runner.rb
@@ -29,7 +29,7 @@ module QA
end
def fabricate_via_api!
- Service::Runner.new(name).tap do |runner|
+ Service::DockerRun::GitlabRunner.new(name).tap do |runner|
runner.pull
runner.token = @token ||= project.runners_token
runner.address = Runtime::Scenario.gitlab_address
@@ -46,7 +46,7 @@ module QA
super
- Service::Runner.new(name).remove!
+ Service::DockerRun::GitlabRunner.new(name).remove!
end
def api_delete_path