Commit 99913466 authored by Nick Thomas's avatar Nick Thomas

Merge branch 'qa-fix-qa-internal' into 'master'

[QA] Fix verbose? being renamed to debug?

See merge request gitlab-org/gitlab-ee!8033
parents 2265fc54 e7bbbfb4
...@@ -117,11 +117,11 @@ module QA ...@@ -117,11 +117,11 @@ module QA
def run(command_str) def run(command_str)
command = [env_vars, command_str, '2>&1'].compact.join(' ') command = [env_vars, command_str, '2>&1'].compact.join(' ')
warn "DEBUG: command=[#{command}]" if Runtime::Env.verbose? warn "DEBUG: command=[#{command}]" if Runtime::Env.debug?
output, _ = Open3.capture2(command) output, _ = Open3.capture2(command)
output = output.chomp.gsub(/\s+$/, '') output = output.chomp.gsub(/\s+$/, '')
warn "DEBUG: output=[#{output}]" if Runtime::Env.verbose? warn "DEBUG: output=[#{output}]" if Runtime::Env.debug?
output output
end end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment