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.

Sign up for GitHub

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

Jump to bottom

Skip reinstalling bootloader if encrypted #19748

Merged
merged 1 commit into from
Jul 19, 2024
Merged

Skip reinstalling bootloader if encrypted #19748

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 8 additions & 3 deletions tests/console/perl_bootloader.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ use testapi;
use serial_terminal 'select_serial_terminal';
use strict;
use warnings;
use utils 'zypper_call';
use utils;
use package_utils;
use power_action_utils 'power_action';
use version_utils qw(is_sle check_version is_transactional);
Expand Down Expand Up @@ -43,8 +43,13 @@ sub run {
}

if (is_transactional) {
trup_call 'run pbl --install';
check_reboot_changes;
if (get_var('FLAVOR') =~ m/-encrypted/i) {
record_soft_failure("bsc#1228126: Encrypted image fails to boot after reinstalling bootloader");
}
else {
trup_call 'run pbl --install';
check_reboot_changes;
}
trup_call 'run pbl --config';
check_reboot_changes;
}
Expand Down
7 changes: 6 additions & 1 deletion tests/transactional/trup_smoke.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,12 @@ sub run {

select_serial_terminal;

action('bootloader', 'Reinstall bootloader');
if (get_var('FLAVOR') =~ m/-encrypted/i) {
record_soft_failure("bsc#1228126: Encrypted image fails to boot after reinstalling bootloader");
}
else {
action('bootloader', 'Reinstall bootloader');
}
action('grub.cfg', 'Regenerate grub.cfg');
action('initrd', 'Regenerate initrd');
action('kdump', 'Regenerate kdump');
Expand Down
Loading