LXC doesn't have the kernel_path hvparam, so the QA running for the LXC hypervisor always fails with this test. This patch changes it to run only when the default_hv is one of the hypervisors which supports the kernel_path hvparam.
Signed-off-by: Yuto KAWAMURA(kawamuray) <[email protected]> --- qa/qa_instance.py | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/qa/qa_instance.py b/qa/qa_instance.py index 93692c2..23aba21 100644 --- a/qa/qa_instance.py +++ b/qa/qa_instance.py @@ -606,14 +606,20 @@ def TestInstanceModify(instance): ["-B", "%s=%s" % (constants.BE_ALWAYS_FAILOVER, constants.VALUE_TRUE)], ["-B", "%s=%s" % (constants.BE_ALWAYS_FAILOVER, constants.VALUE_DEFAULT)], - ["-H", "%s=%s" % (constants.HV_KERNEL_PATH, test_kernel)], - ["-H", "%s=%s" % (constants.HV_KERNEL_PATH, constants.VALUE_DEFAULT)], - # TODO: bridge tests #["--bridge", "xen-br1"], #["--bridge", orig_bridge], ] + # Not all hypervisors support kernel_path(e.g, LXC) + if default_hv in (constants.HT_XEN_PVM, + constants.HT_XEN_HVM, + constants.HT_KVM): + args.extend([ + ["-H", "%s=%s" % (constants.HV_KERNEL_PATH, test_kernel)], + ["-H", "%s=%s" % (constants.HV_KERNEL_PATH, constants.VALUE_DEFAULT)], + ]) + if default_hv == constants.HT_XEN_PVM: args.extend([ ["-H", "%s=%s" % (constants.HV_INITRD_PATH, test_initrd)], -- 2.0.4
