diff options
| author | Dan Davison <ddavison@gitlab.com> | 2019-01-17 20:20:35 +0000 |
|---|---|---|
| committer | Dan Davison <ddavison@gitlab.com> | 2019-01-17 20:20:35 +0000 |
| commit | 49e538d0af3d7615ab4bc08441f967a3f8ad542f (patch) | |
| tree | 3d931267e07b607049d2b83d2b2dc94c5acc81de | |
| parent | a98e7b993a8709b5a1efa116c3a0faaa402e7ac2 (diff) | |
| parent | 8637696cb037a1252ac59ea45cc13c1d82278267 (diff) | |
| download | gitlab-ce-49e538d0af3d7615ab4bc08441f967a3f8ad542f.tar.gz | |
Merge branch 'qa-grid-empty-check' into 'master'
Let QA_REMOTE_GRID be nil or empty string
See merge request gitlab-org/gitlab-ce!24468
| -rw-r--r-- | qa/qa/runtime/env.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/qa/qa/runtime/env.rb b/qa/qa/runtime/env.rb index 79b40223d84..23a2ace6a55 100644 --- a/qa/qa/runtime/env.rb +++ b/qa/qa/runtime/env.rb @@ -63,7 +63,7 @@ module QA # - "https://user:pass@somehost.com:443/wd/hub" # - "http://localhost:4444/wd/hub" - return unless ENV['QA_REMOTE_GRID'] + return if (ENV['QA_REMOTE_GRID'] || '').empty? "#{remote_grid_protocol}://#{remote_grid_credentials}#{ENV['QA_REMOTE_GRID']}/wd/hub" end |