Skip to content

Commit

Permalink
Merge pull request #20636 from dzedro/ui_saptune
Browse files Browse the repository at this point in the history
update_install: Fix two small issues
  • Loading branch information
dzedro authored Nov 14, 2024
2 parents 828f834 + 19d45cd commit 0092845
Showing 1 changed file with 6 additions and 1 deletion.
7 changes: 6 additions & 1 deletion tests/qam-updinstall/update_install.pm
Original file line number Diff line number Diff line change
Expand Up @@ -155,6 +155,11 @@ sub sle12_zypp_resolve {
send y\\r
exp_continue
}
\"View the notifications now\" {
sleep 1
send n\\r
exp_continue
}
-timeout -1 \"# \$\" {
interact
}
Expand Down Expand Up @@ -203,7 +208,7 @@ sub run {
foreach (@modules) {
# substitue SLES_SAP for LTSS repo at this point is SAP ESPOS
$_ =~ s/SAP_(\d+(-SP\d)?)/$1-LTSS/ if is_sle('15+');
$_ =~ s/SAP_(\d+(-SP\d)?)/SERVER_$1-LTSS/ if is_sle('=12-sp5');
$_ =~ s/SAP_(\d+(-SP\d)?)/SERVER_$1-LTSS/ if is_sle('=12-sp5') && !get_var('BUILD') =~ /saptune/;
next if s{http.*SUSE_Updates_(.*)/?}{$1};
die 'Modules regex failed. Modules could not be extracted from repos variable.';
}
Expand Down

0 comments on commit 0092845

Please sign in to comment.