From daa8e9cbd0cbdd23366e15e992c699beaff36a5c Mon Sep 17 00:00:00 2001 From: "Xiaoli Ai(Alice)" Date: Fri, 12 Jul 2024 05:12:47 -0400 Subject: [PATCH] [Virtualization][MU]: add migration test load logic in main.pm --- lib/main_common.pm | 25 ++++++++++++++++++------- 1 file changed, 18 insertions(+), 7 deletions(-) diff --git a/lib/main_common.pm b/lib/main_common.pm index 4ce3f7d9798c..666c42a9df50 100644 --- a/lib/main_common.pm +++ b/lib/main_common.pm @@ -2451,16 +2451,16 @@ sub load_hypervisor_tests { if (check_var('ENABLE_VM_INSTALL', 1)) { loadtest "virt_autotest/login_console"; - loadtest "virtualization/universal/prepare_guests"; - loadtest "virtualization/universal/waitfor_guests"; - if (check_var('PATCH_WITH_ZYPPER', 1)) { - loadtest "virtualization/universal/patch_and_reboot"; - if (my $update_package = get_var('UPDATE_PACKAGE')) { - if ($update_package eq 'kernel-default') { + unless (check_var('VIRT_NEW_GUEST_MIGRATION_DST', '1')) { + loadtest "virtualization/universal/prepare_guests"; + loadtest "virtualization/universal/waitfor_guests"; + if (check_var('PATCH_WITH_ZYPPER', 1)) { + loadtest "virtualization/universal/patch_and_reboot"; + if (check_var('UPDATE_PACKAGE', 'kernel-default')) { loadtest "virt_autotest/login_console"; loadtest "virtualization/universal/list_guests"; loadtest "virtualization/universal/patch_guests"; - } elsif ($update_package eq 'xen' || $update_package eq 'qemu') { + } elsif (check_var('UPDATE_PACKAGE', 'xen') || check_var('UPDATE_PACKAGE', 'qemu')) { loadtest "virt_autotest/login_console"; loadtest "virtualization/universal/list_guests"; } @@ -2524,6 +2524,17 @@ sub load_hypervisor_tests { } # Load ENABLE_SNAPSHOTS at the end check_and_load_mu_virt_features('ENABLE_SNAPSHOTS', $virt_features{ENABLE_SNAPSHOTS}{modules}, $virt_features{ENABLE_SNAPSHOTS}{hypervisor}); + + # Guest migration tests + if (check_var('VIRT_NEW_GUEST_MIGRATION_SOURCE', '1')) { + loadtest "virt_autotest/login_console"; + loadtest "virt_autotest/parallel_guest_migration_source"; + } + if (check_var('VIRT_NEW_GUEST_MIGRATION_DST', '1')) { + loadtest "virt_autotest/parallel_guest_migration_barrier"; + loadtest "virt_autotest/login_console"; + loadtest "virt_autotest/parallel_guest_migration_destination"; + } } sub load_extra_tests_syscontainer {