Merge pull request #17018 from rfan1/autoyast_qem_addon

Apply workaround for bsc#1202234 for autoyast install
os-autoinst · May 9, 2023 · 6164a38 · 6164a38
2 parents 32f2418 + 577a9d2
commit 6164a38
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 10 deletions.
diff --git a/data/autoyast_qam/12-common_base_installation.xml.ep b/data/autoyast_qam/12-common_base_installation.xml.ep
@@ -315,6 +315,13 @@
     % if ($get_var->('SCC_ADDONS') =~ m/\brt\b/) {
     <kernel>kernel-rt</kernel>
     % }
+    <packages config:type="list">
+      <!-- Workaround for bsc#1202234: [addon]-release packages are missing after autoyast installation. -->
+      % foreach (values %$addons) {
+      <package><%= lc($_->{name}) %>-release</package>
+      % }
+      <!-- end of workaround -->
+    </packages>
     <patterns config:type="list">
       % for my $pattern (@$patterns) {
       <pattern><%= $pattern %></pattern>

diff --git a/data/autoyast_qam/15-common_base_installation.xml.ep b/data/autoyast_qam/15-common_base_installation.xml.ep
@@ -280,12 +280,17 @@
     % if ($get_var->('SCC_ADDONS') =~ m/\brt\b/) {
     <kernel>kernel-rt</kernel>
     % }
-    % if ($check_var->('VERSION', '15-SP3') or $check_var->('VERSION', '15-SP4')) {
     <packages config:type="list">
+      <!-- Workaround for bsc#1202234: [addon]-release packages are missing after autoyast installation. -->
+      % foreach (values %$addons) {
+      <package><%= lc($_->{name}) %>-release</package>
+      % }
+      <!-- end of workaround -->
+    % if ($check_var->('VERSION', '15-SP3') or $check_var->('VERSION', '15-SP4')) {
       <package>openssh</package>
       <package>firewalld</package>
-    </packages>
     % }
+    </packages>
     <patterns config:type="list">
       % for my $pattern (@$patterns) {
       <pattern><%= $pattern %></pattern>

diff --git a/tests/qa_automation/patch_and_reboot.pm b/tests/qa_automation/patch_and_reboot.pm
@@ -37,14 +37,6 @@ sub run {
 
     quit_packagekit unless check_var('DESKTOP', 'textmode');
 
-    # We need to activated SLES-LTSS product again on system installed via autoyast
-    # https://progress.opensuse.org/issues/128840
-    # https://bugzilla.suse.com/show_bug.cgi?id=1211154
-    if (get_var('AUTOYAST') && get_var('SCC_ADDONS') =~ /ltss/ && script_run('test -f /etc/products.d/SLES-LTSS.prod') != 0) {
-        record_soft_failure('bsc#1211154');
-        add_suseconnect_product('SLES-LTSS', undef, undef, '-r ' . get_var('SCC_REGCODE_LTSS'), 150);
-    }
-
     zypper_call(q{mr -d $(zypper lr | awk -F '|' '{IGNORECASE=1} /nvidia/ {print $2}')}, exitcode => [0, 3]);
 
     add_test_repositories;