main_ltp: Workaround broken grub menu items on sle-micro

transactional needs to first run install_ltp due broken grub menu counting detection in add_custom_grub_entries(): Test died: Unexpected number of grub entries: 5, expected: 3 at lib/bootloader_setup.pm line 166. Signed-off-by: Petr Vorel <[email protected]>
os-autoinst · Jan 27, 2025 · ba23167 · ba23167
1 parent 9722bd1
commit ba23167
Showing 1 changed file with 13 additions and 6 deletions.
diff --git a/lib/main_ltp.pm b/lib/main_ltp.pm
@@ -62,15 +62,22 @@ sub load_kernel_tests {
         if (get_var('FLAVOR', '') =~ /Incidents-Kernel/) {
             loadtest_kernel 'update_kernel';
         }
-        if (is_transactional && (get_var('FLAVOR', '') =~ /-Staging|-Updates/)) {
-            if (get_var('KGRAFT')) {
-                loadtest_kernel 'update_kernel';
-            } else {
-                loadtest 'transactional/install_updates';
-            }
+
+        # transactional needs to first run install_ltp due broken grub menu
+        # counting detection in add_custom_grub_entries():
+        # Test died: Unexpected number of grub entries: 5, expected: 3 at lib/bootloader_setup.pm line 166.
+        my $needs_update = is_transactional && (get_var('FLAVOR', '') =~ /-Staging|-Updates/);
+
+        if ($needs_update && get_var('KGRAFT')) {
+            loadtest_kernel 'update_kernel';
         }
+
         loadtest_kernel 'install_ltp';
 
+        if ($needs_update && !get_var('KGRAFT')) {
+            loadtest 'transactional/install_updates';
+        }
+
         if (get_var('LIBC_LIVEPATCH')) {
             die 'LTP_COMMAND_FILE and LIBC_LIVEPATCH are mutually exclusive'
               if get_var('LTP_COMMAND_FILE');