diff options
Diffstat (limited to 'qa/qa/service/docker_run/gitlab_runner.rb')
| -rw-r--r-- | qa/qa/service/docker_run/gitlab_runner.rb | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/qa/qa/service/docker_run/gitlab_runner.rb b/qa/qa/service/docker_run/gitlab_runner.rb index 078a3048cad..b0bb999e5d6 100644 --- a/qa/qa/service/docker_run/gitlab_runner.rb +++ b/qa/qa/service/docker_run/gitlab_runner.rb @@ -16,7 +16,7 @@ module QA MSG def initialize(name) - @image = "#{QA::Runtime::Env.container_registry_host}/gitlab-org/gitlab-runner:alpine" + @image = "#{QA::Runtime::Env.container_registry_host}/gitlab-org/#{QA::Runtime::Env.runner_container_image}" @name = name || "qa-runner-#{SecureRandom.hex(4)}" @run_untagged = true @executor = :shell @@ -40,9 +40,10 @@ module QA raise("Missing runner token value!") unless token cmd = <<~CMD.tr("\n", ' ') - docker run -d --rm --network #{runner_network} --name #{@name} + docker run -d --rm --network #{network} --name #{@name} #{'-v /var/run/docker.sock:/var/run/docker.sock' if @executor == :docker} --privileged + #{"--add-host gdk.test:#{gdk_host_ip}" if gdk_network} #{@image} #{add_gitlab_tls_cert if @address.include? 'https'} && docker exec --detach #{@name} sh -c "#{register_command}" CMD @@ -51,7 +52,7 @@ module QA wait_until_running_and_configured # Prove airgappedness - shell("docker exec #{@name} sh -c '#{prove_airgap}'") if runner_network == 'airgapped' + shell("docker exec #{@name} sh -c '#{prove_airgap}'") if network == 'airgapped' end def tags=(tags) |