Merge pull request #8819 from mdoucha/klp_preinstall_dev

Install kernel-devel package in install_ltp
os-autoinst · Nov 19, 2019 · 15ce9dc · 15ce9dc
2 parents 0d89e9d + 8dad5d2
commit 15ce9dc
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/tests/kernel/qa_test_klp.pm b/tests/kernel/qa_test_klp.pm
@@ -35,7 +35,7 @@ sub run {
 
     add_suseconnect_product("sle-sdk") if (is_sle('<12-SP5'));
 
-    zypper_call('in -l git gcc kernel-devel make');
+    zypper_call('in -l git gcc make');
 
     assert_script_run('git clone ' . $git_repo);
 

diff --git a/tests/kernel/update_kernel.pm b/tests/kernel/update_kernel.pm
@@ -35,6 +35,7 @@ sub update_kernel {
     my ($repo, $incident_id) = @_;
 
     fully_patch_system;
+    zypper_call('in kernel-devel');
 
     my @repos = split(",", $repo);
     while (my ($i, $val) = each(@repos)) {
@@ -135,6 +136,8 @@ sub install_lock_kernel {
         @packages = grep { $_ ne 'kernel-source-4.12.14-25.13.1' } @packages;
     }
 
+    push @packages, "kernel-devel=$version";
+
     # install and lock needed kernel
     zypper_call("in " . join(' ', @packages), exitcode => [0, 102, 103, 104], timeout => 1400);
     zypper_call("al " . join(' ', @lpackages));
@@ -257,7 +260,7 @@ sub install_kotd {
     fully_patch_system;
     remove_kernel_packages;
     zypper_ar($repo, name => 'KOTD', priority => 90, no_gpg_check => 1);
-    zypper_call("in -l kernel-default");
+    zypper_call("in -l kernel-default kernel-devel");
 }
 
 sub boot_to_console {