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

boot_into_snapshot moved to boot_into_snapshot #8673

Closed
wants to merge 1 commit into from
Closed

boot_into_snapshot moved to boot_into_snapshot #8673

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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion lib/main_common.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -429,7 +429,7 @@ sub load_reboot_tests {
# test makes no sense on s390 because grub2 can't be captured
if (!(is_s390x or (check_var('VIRSH_VMM_FAMILY', 'xen') and check_var('VIRSH_VMM_TYPE', 'linux')))) {
# exclude this scenario for autoyast test with switched keyboard layaout. also exclude on ipmi as installation/first_boot will call wait_grub
loadtest "installation/grub_test" unless get_var('INSTALL_KEYBOARD_LAYOUT') || get_var('KEEP_GRUB_TIMEOUT') || check_var('BACKEND', 'ipmi');
loadtest "installation/grub_test" unless get_var('INSTALL_KEYBOARD_LAYOUT') || get_var('KEEP_GRUB_TIMEOUT') || check_var('BACKEND', 'ipmi') || check_var('BOOT_TO_SNAPSHOT');
if ((snapper_is_applicable()) && get_var("BOOT_TO_SNAPSHOT")) {
loadtest "installation/boot_into_snapshot";
}
Expand Down
1 change: 0 additions & 1 deletion schedule/boot_to_snapshot.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,5 @@ description: >
vars:
BOOT_TO_SNAPSHOT: 1
schedule:
- installation/grub_test
- installation/boot_into_snapshot
- installation/first_boot
3 changes: 3 additions & 0 deletions tests/installation/boot_into_snapshot.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,12 @@ use strict;
use warnings;
use testapi;
use base "opensusebasetest";
use bootloader_setup qw(stop_grub_timeout boot_into_snapshot);

sub run {
my ($self) = @_;
stop_grub_timeout;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We have more steps in grub_test which we should have here. Like entering password if boot partition is encrypted and asserting that grub is shown. And some special steps for xen, for which we don't have VR.

TBH, now I'm not sure if this separation will make out lives any better....

boot_into_snapshot;
assert_screen 'linux-login', 200;
select_console 'root-console';
# 1)
Expand Down
5 changes: 2 additions & 3 deletions tests/installation/grub_test.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
# Summary: Handle grub menu after reboot
# - Handle grub2 to boot from hard disk (opposed to installation)
# - Handle passphrase for encrypted disks
# - Handle booting of snapshot or XEN, acconding to BOOT_TO_SNAPSHOT or XEN
# - Handle booting of XEN, acconding to XEN
# - Enable plymouth debug if product if GRUB_KERNEL_OPTION_APPEND is set,
# or product is sle, aarch64 and PLYMOUTH_DEBUG is set
# Tags: poo#9716, poo#10286, poo#10164
Expand Down Expand Up @@ -77,12 +77,11 @@ sub run {
# 90 as a workaround due to the qemu backend fallout
assert_screen_with_soft_timeout('grub2', timeout => 2 * $timeout, soft_timeout => $timeout, bugref => 'boo#1120256');
stop_grub_timeout;
boot_into_snapshot if get_var("BOOT_TO_SNAPSHOT");
send_key_until_needlematch("bootmenu-xen-kernel", 'down', 10, 5) if get_var('XEN');
if ((check_var('ARCH', 'aarch64') && is_sle && get_var('PLYMOUTH_DEBUG'))
|| get_var('GRUB_KERNEL_OPTION_APPEND'))
{
$self->bug_workaround_bsc1005313 unless get_var("BOOT_TO_SNAPSHOT");
$self->bug_workaround_bsc1005313;
}
else {
# avoid timeout for booting to HDD
Expand Down