Commit 73b8f8e1 authored by Thomas Thrainer's avatar Thomas Thrainer
Browse files

Fix invocation of GetCommandOutput in QA

The cherry-picked function _GetOutputFromMaster() calls
GetCommandOutput() with parameters only present in newer Ganeti
branches. Remove those parameters as they cause errors in stable-2.10.
Signed-off-by: default avatarThomas Thrainer <>
Reviewed-by: default avatarHelga Velroyen <>
parent b63453e9
......@@ -55,8 +55,7 @@ def _GetOutputFromMaster(cmd, use_multiplexer=True, log_cmd=True):
# buildbot
cmdstr += " 2>&1"
return GetCommandOutput(qa_config.GetMasterNode().primary, cmdstr,
use_multiplexer=use_multiplexer, log_cmd=log_cmd)
return GetCommandOutput(qa_config.GetMasterNode().primary, cmdstr)
def ExecuteJobProducingCommand(cmd):
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