Handle the server with multiple NVMe disks

os-autoinst · Aug 14, 2024 · fa81f37 · fa81f37
1 parent c896793
commit fa81f37
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/lib/partition_setup.pm b/lib/partition_setup.pm
@@ -486,9 +486,10 @@ sub select_first_hard_disk {
               if ($matched_needle && $matched_needle->{needle}->has_tag("hard-disk-dev-$device-selected"));
         }
     }
-    # Check if sda is still/already selected, if not select it
-    assert_screen [qw(select-hard-disks-one-selected hard-disk-dev-sda-not-selected)];
+    # Check if sda is still/already selected, if not select it, select the first disk device if none selected
+    assert_screen [qw(select-hard-disks-one-selected hard-disk-dev-sda-not-selected select-hard-disks-none-selected)];
     assert_and_click 'hard-disk-dev-sda-not-selected' if match_has_tag('hard-disk-dev-sda-not-selected');
+    assert_and_click 'hard-disk-dev-first-select' if (match_has_tag('select-hard-disks-none-selected') && !match_has_tag('hard-disk-dev-sda-not-selected'));
     save_screenshot;
     send_key $cmd{next};
 }

diff --git a/tests/installation/start_install.pm b/tests/installation/start_install.pm
@@ -80,7 +80,8 @@ sub run {
         assert_screen("inst-packageinstallationstarted", $started_timeout);
     }
     else {
-        wait_still_screen(3);    # wait so alt-i is pressed when installation overview is not being generated
+        my $time_out = is_ipmi ? 10 : 3;
+        wait_still_screen($time_out);    # wait so alt-i is pressed when installation overview is not being generated
         send_key $cmd{install};
         if (check_var('FAIL_EXPECTED', 'SMALL-DISK')) {
             assert_screen 'installation-proposal-error';