virt_autotest: enhancement reboot_and_wait_up_normal for s390x

guoxuguang · Jul 8, 2024 · 34f511f · 34f511f
1 parent c5e0e70
commit 34f511f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/products/sle/main.pm b/products/sle/main.pm
@@ -864,8 +864,8 @@ elsif (get_var("VIRT_AUTOTEST")) {
         loadtest "virt_autotest/update_package";
         # Skip reset_partition for s390x due to there just be 42Gib disk space for each s390x LPAR
         loadtest "virt_autotest/reset_partition" if (!is_s390x);
-        # Skip reboot_and_wait_up_normal for s390x due to new changes from svirt backend for power_action_utils::power_action (see poo#151786)
-        loadtest "virt_autotest/reboot_and_wait_up_normal" if (!get_var('AUTOYAST') && get_var('REPO_0_TO_INSTALL') && (!is_s390x));
+        loadtest "virt_autotest/reboot_and_wait_up_normal" if (!get_var('AUTOYAST') && get_var('REPO_0_TO_INSTALL'));
+        loadtest "boot/reconnect_mgmt_console" if (is_s390x);
         loadtest "virt_autotest/download_guest_assets" if get_var("SKIP_GUEST_INSTALL") && is_x86_64;
     }
     if (get_var("VIRT_PRJ1_GUEST_INSTALL")) {

diff --git a/tests/virt_autotest/reboot_and_wait_up.pm b/tests/virt_autotest/reboot_and_wait_up.pm
@@ -12,7 +12,7 @@ use warnings;
 use testapi;
 use ipmi_backend_utils;
 use base "proxymode";
-use power_action_utils 'power_action';
+use power_action_utils "power_action";
 use Utils::Architectures;
 use virt_autotest::utils;
 
@@ -23,9 +23,7 @@ sub reboot_and_wait_up {
     if (is_s390x) {
         record_info('INFO', 'Reboot LPAR');
         #Reboot s390x lpar
-        power_action('reboot', observe => 1, keepconsole => 1);
-        my $svirt = select_console('svirt', await_console => 0);
-        return;
+        power_action('reboot', observe => 1, keepconsole => 1, first_reboot => 1);
     }
 
     if (get_var("PROXY_MODE")) {