Remove softfailure bug: 1221812

Progress ticket:https://progress.opensuse.org/issues/163061
os-autoinst · Nov 15, 2024 · 7c46fda · 7c46fda
1 parent 885466c
commit 7c46fda
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 30 deletions.
diff --git a/lib/main_common.pm b/lib/main_common.pm
@@ -2390,7 +2390,9 @@ sub set_mu_virt_vars {
 
     my $_pkg = $2;
     my $_update_package = '';
-    if ($_pkg =~ /qemu|xen|virt-manager|libguestfs|libslirp|open-vm-tools/) {
+    if ($_pkg =~ /none/) {
+        $_update_package = '';
+    } elsif  ($_pkg =~ /qemu|xen|virt-manager|libguestfs|libslirp|open-vm-tools/) {
         $_update_package = $_pkg;
     } elsif ($_pkg =~ /libvirt/) {
         $_update_package = 'libvirt-client';

diff --git a/lib/parallel_guest_migration_base.pm b/lib/parallel_guest_migration_base.pm
@@ -697,8 +697,6 @@ sub initialize_test_result {
 
     $self->set_test_run_progress;
     my @_guest_migration_test = split(/,/, get_var('GUEST_MIGRATION_TEST', ''));
-    # Remove 'virsh_live_native_p2p_manual_postcopy' if present and record a soft failure
-    @_guest_migration_test = $self->filter_migration_tests(migration_tests => \@_guest_migration_test) if (is_sle('=15-sp6'));
     my $_full_test_matrix = is_kvm_host ? $parallel_guest_migration_base::guest_migration_matrix{kvm} : $parallel_guest_migration_base::guest_migration_matrix{xen};
     @_guest_migration_test = keys(%$_full_test_matrix) if (scalar @_guest_migration_test == 0);
     my $_localip = get_required_var('LOCAL_IPADDR');
@@ -1752,27 +1750,6 @@ sub check_peer_test_run {
     return $_peer_test_run_result;
 }
 
-=head2 filter_migration_tests
-
-Filters migration tests based on specified criteria.
-
-=cut
-
-sub filter_migration_tests {
-    my ($self, %args) = @_;
-    my @migration_tests = @{$args{migration_tests}};
-    my @guest_migration_test;
-
-    foreach (@migration_tests) {
-        if ($_ eq 'virsh_live_native_p2p_manual_postcopy') {
-            record_soft_failure('bsc#1221812 - qemu coredump when virsh migrate postcopy + virsh migrate-postcopy on sle15sp6 kvm host.');
-        } else {
-            push @guest_migration_test, $_;
-        }
-    }
-    return @guest_migration_test;
-}
-
 =head2 post_fail_hook
 
 Set TEST_RUN_RESULT to FAILED, create junit log and collect logs.

diff --git a/tests/virt_autotest/parallel_guest_migration_destination.pm b/tests/virt_autotest/parallel_guest_migration_destination.pm
@@ -41,7 +41,6 @@ use mmapi;
 use virt_autotest::utils qw(is_kvm_host is_xen_host check_host_health check_guest_health is_fv_guest is_pv_guest add_guest_to_hosts);
 use virt_utils qw(collect_host_and_guest_logs cleanup_host_and_guest_logs enable_debug_logging);
 use virt_autotest::domain_management_utils qw(construct_uri create_guest remove_guest shutdown_guest show_guest check_guest_state);
-use version_utils qw(is_sle);
 
 =head2 run_test
 
@@ -134,8 +133,6 @@ sub guest_migration_test {
 
     $self->set_test_run_progress;
     my @guest_migration_test = split(/,/, get_var('GUEST_MIGRATION_TEST'));
-    # Remove 'virsh_live_native_p2p_manual_postcopy' if present and record a soft failure
-    @guest_migration_test = $self->filter_migration_tests(migration_tests => \@guest_migration_test) if (is_sle('=15-sp6'));
     my $full_test_matrix = is_kvm_host ? $parallel_guest_migration_base::guest_migration_matrix{kvm} : $parallel_guest_migration_base::guest_migration_matrix{xen};
     @guest_migration_test = keys(%$full_test_matrix) if (scalar @guest_migration_test == 0);
     my $localip = get_required_var('LOCAL_IPADDR');

diff --git a/tests/virt_autotest/parallel_guest_migration_source.pm b/tests/virt_autotest/parallel_guest_migration_source.pm
@@ -42,7 +42,6 @@ use virt_autotest::utils qw(is_kvm_host is_xen_host check_host_health check_gues
 use virt_utils qw(collect_host_and_guest_logs cleanup_host_and_guest_logs enable_debug_logging);
 use utils qw(script_retry);
 use virt_autotest::domain_management_utils qw(construct_uri create_guest remove_guest shutdown_guest show_guest check_guest_state);
-use version_utils qw(is_sle);
 
 =head2 run_test
 
@@ -164,8 +163,6 @@ sub guest_migration_test {
 
     $self->set_test_run_progress;
     my @guest_migration_test = split(/,/, get_var('GUEST_MIGRATION_TEST', ''));
-    # Remove 'virsh_live_native_p2p_manual_postcopy' if present and record a soft failure
-    @guest_migration_test = $self->filter_migration_tests(migration_tests => \@guest_migration_test) if (is_sle('=15-sp6'));
     my $full_test_matrix = is_kvm_host ? $parallel_guest_migration_base::guest_migration_matrix{kvm} : $parallel_guest_migration_base::guest_migration_matrix{xen};
     @guest_migration_test = keys(%$full_test_matrix) if (scalar @guest_migration_test == 0);
     my $localip = get_required_var('LOCAL_IPADDR');