Commit 4a0283b8 authored by Yuto KAWAMURA(kawamuray)'s avatar Yuto KAWAMURA(kawamuray) Committed by Hrvoje Ribicic

QA: Change modify test for kernel_path hvparam to optional

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: default avatarYuto KAWAMURA(kawamuray) <kawamuray.dadada@gmail.com>
Reviewed-by: default avatarHrvoje Ribicic <riba@google.com>
parent 5b8754f4
......@@ -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)],
......
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