Merge branch 'ml-qa-repo-logging' into 'master'

Re-enable debug logging of Git commands and output

See merge request gitlab-org/gitlab-ce!22608

2 files changed, 5 insertions, 7 deletions

diff --git a/qa/qa/git/repository.rb b/qa/qa/git/repository.rb
index c6a8891d398..27a88534258 100644
--- a/qa/qa/git/repository.rb
+++ b/qa/qa/git/repository.rb
@@ -113,21 +113,17 @@ module QA
 
       attr_reader :uri, :username, :password, :known_hosts_file, :private_key_file
 
-      def debug?
-        Runtime::Env.respond_to?(:verbose?) && Runtime::Env.verbose?
-      end
-
       def ssh_key_set?
         !private_key_file.nil?
       end
 
       def run(command_str)
         command = [env_vars, command_str, '2>&1'].compact.join(' ')
-        warn "DEBUG: command=[#{command}]" if debug?
+        Runtime::Logger.debug "Git: command=[#{command}]"
 
         output, _ = Open3.capture2(command)
         output = output.chomp.gsub(/\s+$/, '')
-        warn "DEBUG: output=[#{output}]" if debug?
+        Runtime::Logger.debug "Git: output=[#{output}]"
 
         output
       end
diff --git a/qa/qa/runtime/logger.rb b/qa/qa/runtime/logger.rb
index 83b10e73ad9..bd5c4fe5bf5 100644
--- a/qa/qa/runtime/logger.rb
+++ b/qa/qa/runtime/logger.rb
@@ -10,11 +10,13 @@ module QA
       def_delegators :logger, :debug, :info, :warn, :error, :fatal, :unknown
 
       singleton_class.module_eval do
+        attr_writer :logger
+
         def logger
           return @logger if @logger
 
           @logger = ::Logger.new Runtime::Env.log_destination
-          @logger.level = ::Logger::DEBUG
+          @logger.level = Runtime::Env.debug? ? ::Logger::DEBUG : ::Logger::ERROR
           @logger
         end
       end