Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'qa/qa/service/docker_run/base.rb')
-rw-r--r--qa/qa/service/docker_run/base.rb21
1 files changed, 11 insertions, 10 deletions
diff --git a/qa/qa/service/docker_run/base.rb b/qa/qa/service/docker_run/base.rb
index ce558849abd..1a25aeb4c19 100644
--- a/qa/qa/service/docker_run/base.rb
+++ b/qa/qa/service/docker_run/base.rb
@@ -39,19 +39,20 @@ module QA
end
def network
- shell "docker network inspect #{@network}"
- rescue CommandError
- 'bridge'
- else
- @network
+ network_exists?(@network) ? @network : 'bridge'
end
def runner_network
- shell "docker network inspect #{@runner_network}"
- rescue CommandError
- network
- else
- @runner_network
+ network_exists?(@runner_network) ? @runner_network : network
+ end
+
+ def inspect_network(name)
+ shell("docker network inspect #{name}", fail_on_exception: false, return_exit_status: true)
+ end
+
+ def network_exists?(name)
+ _, status = inspect_network(name)
+ status == 0
end
def pull