From 5287327f52558229f601c6c2a7ff991d1e591c49 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Vidot?= Date: Tue, 16 Jul 2024 14:04:12 +0200 Subject: [PATCH] Skip bootloader reinstall if encrypted https://openqa.suse.de/tests/14961319 --- tests/console/perl_bootloader.pm | 11 ++++++++--- tests/transactional/trup_smoke.pm | 7 ++++++- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/tests/console/perl_bootloader.pm b/tests/console/perl_bootloader.pm index 549d6661a588..5d57a4b05929 100644 --- a/tests/console/perl_bootloader.pm +++ b/tests/console/perl_bootloader.pm @@ -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); @@ -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; } diff --git a/tests/transactional/trup_smoke.pm b/tests/transactional/trup_smoke.pm index e9312ff24cd3..f8f6c92de66b 100644 --- a/tests/transactional/trup_smoke.pm +++ b/tests/transactional/trup_smoke.pm @@ -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');