Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Apply workaround for bsc#1202234 for autoyast install #17018

Merged
merged 1 commit into from
May 9, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
7 changes: 7 additions & 0 deletions data/autoyast_qam/12-common_base_installation.xml.ep
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
9 changes: 7 additions & 2 deletions data/autoyast_qam/15-common_base_installation.xml.ep
Original file line number Diff line number Diff line change
Expand Up @@ -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. -->
rfan1 marked this conversation as resolved.
Show resolved Hide resolved
% 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>
Expand Down
8 changes: 0 additions & 8 deletions tests/qa_automation/patch_and_reboot.pm
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down