diff options
author | Robert Speicher <robert@gitlab.com> | 2018-02-09 16:07:00 +0000 |
---|---|---|
committer | Mark Fletcher <mark@gitlab.com> | 2018-02-13 18:49:00 +0000 |
commit | 5c209876ba2a6e78ee4b739b04799096c651061b (patch) | |
tree | c13c01d5b198a8491225896c7a420577b35d94b4 | |
parent | ed1c8857fecf50467a3466631140af31a28817cc (diff) | |
download | gitlab-ce-10-5-stable-prepare-rc5.tar.gz |
Merge branch 'qa/gb/do-not-require-test-network-in-pipeline-tests' into 'master'10-5-stable-prepare-rc5
Do not attach runner to a non-exsiting network in QA
Closes gitlab-qa#180
See merge request gitlab-org/gitlab-ce!17028
-rw-r--r-- | qa/qa/service/runner.rb | 10 | ||||
-rw-r--r-- | qa/qa/service/shellout.rb | 4 |
2 files changed, 12 insertions, 2 deletions
diff --git a/qa/qa/service/runner.rb b/qa/qa/service/runner.rb index d0ee33c69f2..c0352e0467a 100644 --- a/qa/qa/service/runner.rb +++ b/qa/qa/service/runner.rb @@ -15,6 +15,14 @@ module QA @tags = %w[qa test] end + def network + shell "docker network inspect #{@network}" + rescue CommandError + 'bridge' + else + @network + end + def pull shell "docker pull #{@image}" end @@ -22,7 +30,7 @@ module QA def register! shell <<~CMD.tr("\n", ' ') docker run -d --rm --entrypoint=/bin/sh - --network #{@network} --name #{@name} + --network #{network} --name #{@name} -e CI_SERVER_URL=#{@address} -e REGISTER_NON_INTERACTIVE=true -e REGISTRATION_TOKEN=#{@token} diff --git a/qa/qa/service/shellout.rb b/qa/qa/service/shellout.rb index 898febde63c..76fb2af6319 100644 --- a/qa/qa/service/shellout.rb +++ b/qa/qa/service/shellout.rb @@ -3,6 +3,8 @@ require 'open3' module QA module Service module Shellout + CommandError = Class.new(StandardError) + ## # TODO, make it possible to use generic QA framework classes # as a library - gitlab-org/gitlab-qa#94 @@ -14,7 +16,7 @@ module QA out.each { |line| puts line } if wait.value.exited? && wait.value.exitstatus.nonzero? - raise "Command `#{command}` failed!" + raise CommandError, "Command `#{command}` failed!" end end end |