From 31c92937666b5cd4bb4886820aa5ad6f8e07b842 Mon Sep 17 00:00:00 2001
From: Martin Doucha <mdoucha@suse.cz>
Date: Mon, 3 Feb 2025 15:05:42 +0100
Subject: [PATCH] qa_test_klp: Add support for transactional systems

Use the install_package() helper function instead of direct zypper_call().
---
 tests/kernel/qa_test_klp.pm | 26 ++++++++++++++++----------
 1 file changed, 16 insertions(+), 10 deletions(-)

diff --git a/tests/kernel/qa_test_klp.pm b/tests/kernel/qa_test_klp.pm
index a5648d352900..d6d6e755c2a8 100644
--- a/tests/kernel/qa_test_klp.pm
+++ b/tests/kernel/qa_test_klp.pm
@@ -17,6 +17,8 @@ use serial_terminal 'select_serial_terminal';
 use utils;
 use registration;
 use version_utils 'is_sle';
+use transactional;
+use package_utils;
 
 sub run {
     if (get_var('AZURE')) {
@@ -24,15 +26,6 @@ sub run {
         return;
     }
 
-    if (script_run('[ -d /lib/modules/$(uname -r)/build ]') != 0) {
-        if (check_var('SLE_PRODUCT', 'slert')) {
-            zypper_call('in -l kernel-devel-rt');
-        }
-        else {
-            zypper_call('in -l kernel-devel');
-        }
-    }
-
     my $git_repo = get_required_var('QA_TEST_KLP_REPO');
     my $dir = basename($git_repo);
     $dir =~ s/\.git$//;
@@ -40,7 +33,20 @@ sub run {
     (is_sle(">12-sp1") || !is_sle) ? select_serial_terminal() : select_console('root-console');
 
     add_suseconnect_product("sle-sdk") if (is_sle('<12-SP5'));
-    zypper_call('in -l autoconf automake gcc git make');
+    install_package('autoconf automake gcc git make');
+
+    if (script_run('[ -d /lib/modules/$(uname -r)/build ]') != 0) {
+        my $devel_pack = 'kernel-devel';
+
+        if (check_var('SLE_PRODUCT', 'slert')) {
+            $devel_pack = 'kernel-devel-rt';
+        }
+
+        # Force recommended packages to pull in kernel-default-devel, etc.
+        install_package("--recommends $devel_pack", trup_continue => 1);
+    }
+
+    reboot_on_changes;
 
     assert_script_run('git config --global http.sslVerify false');
     assert_script_run('git clone ' . $git_repo);