Remove soft_fail when modifying kernel multiversion

sofiasyria · Nov 21, 2023 · 6df2c35 · 6df2c35
1 parent 7363643
commit 6df2c35
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 12 deletions.
diff --git a/lib/migration.pm b/lib/migration.pm
@@ -23,7 +23,7 @@ our @EXPORT = qw(
   register_system_in_textmode
   deregister_dropped_modules
   disable_installation_repos
-  disable_kernel_multiversion
+  modify_kernel_multiversion
   record_disk_info
   check_rollback_system
   reset_consoles_tty
@@ -158,7 +158,7 @@ sub disable_installation_repos {
 
 # Based on bsc#1097111, need to disable kernel multiversion before migration, and enable it after migration
 # https://documentation.suse.com/sles/15-SP3/html/SLES-all/cha-update-preparation.html#sec-update-preparation-multiversion
-sub disable_kernel_multiversion {
+sub modify_kernel_multiversion {
     my $sed_para = check_var('VERSION', get_var('ORIGIN_SYSTEM_VERSION')) ? 's/^multiversion/#multiversion/g' : 's/^#multiversion/multiversion/g';
     script_run("sed -i $sed_para /etc/zypp/zypp.conf");
 }

diff --git a/tests/console/system_prepare.pm b/tests/console/system_prepare.pm
@@ -22,7 +22,7 @@ use bootloader_setup qw(change_grub_config grub_mkconfig);
 use registration;
 use services::registered_addons 'full_registered_check';
 use List::MoreUtils 'uniq';
-use migration 'disable_kernel_multiversion';
+use migration 'modify_kernel_multiversion';
 use strict;
 use warnings;
 
@@ -94,8 +94,7 @@ sub run {
 
     # enable multiversion for kernel-default based on bsc#1097111, for migration continuous cases only
     if (get_var('FLAVOR', '') =~ /Continuous-Migration/) {
-        record_soft_failure 'bsc#1097111 - File conflict of SLE12 SP3 and SLE15 kernel';
-        disable_kernel_multiversion;
+        modify_kernel_multiversion;
     }
 
     assert_script_run 'rpm -q systemd-coredump || zypper -n in systemd-coredump || true', timeout => 200 if get_var('COLLECT_COREDUMPS');

diff --git a/tests/migration/online_migration/post_migration.pm b/tests/migration/online_migration/post_migration.pm
@@ -15,7 +15,7 @@ use utils;
 use version_utils qw(is_desktop_installed is_sles4sap is_sle);
 use qam qw(add_test_repositories remove_test_repositories);
 use x11utils 'ensure_unlocked_desktop';
-use migration 'disable_kernel_multiversion';
+use migration 'modify_kernel_multiversion';
 
 sub run {
     select_console 'root-console';
@@ -39,8 +39,7 @@ sub run {
 
     # enable multiversion for kernel-default based on bsc#1097111, for migration continuous cases only
     if (get_var('FLAVOR', '') =~ /Continuous-Migration/) {
-        record_soft_failure 'bsc#1097111 - File conflict of SLE12 SP3 and SLE15 kernel';
-        disable_kernel_multiversion;
+        modify_kernel_multiversion;
     }
 
     add_maintenance_repos() if (get_var('MAINT_TEST_REPO'));

diff --git a/tests/migration/online_migration/zypper_patch.pm b/tests/migration/online_migration/zypper_patch.pm
@@ -33,8 +33,7 @@ sub run {
     deregister_dropped_modules;
     # disable multiversion for kernel-default based on bsc#1097111, for migration continuous cases only
     if (get_var('FLAVOR', '') =~ /Continuous-Migration/) {
-        record_soft_failure 'bsc#1097111 - File conflict of SLE12 SP3 and SLE15 kernel';
-        disable_kernel_multiversion;
+        modify_kernel_multiversion;
     }
 
     cleanup_disk_space if get_var('REMOVE_SNAPSHOTS');

diff --git a/tests/update/patch_sle.pm b/tests/update/patch_sle.pm
@@ -119,8 +119,7 @@ sub patching_sle {
 
     # disable multiversion for kernel-default based on bsc#1097111, for migration continuous cases only
     if (get_var('FLAVOR', '') =~ /Continuous-Migration/) {
-        record_info("Softfail", "bsc#1097111 - File conflict of SLE12 SP3 and SLE15 kernel");
-        disable_kernel_multiversion;
+        modify_kernel_multiversion;
     }
 
     # Record the installed rpm list