srbala/os-autoinst-distri-fedora
1
0
Fork 0
mirror of https://pagure.io/fedora-qa/os-autoinst-distri-fedora.git synced 2024-11-25 07:13:09 +00:00
Code Issues Releases Activity

ostree rebase: drop an old unneeded workaround

Browse Source 
Signed-off-by: Adam Williamson <awilliam@redhat.com>
This commit is contained in:
Adam Williamson 2023-06-12 08:56:26 -07:00
parent e8df07813b
commit d964129736
1 changed files with 3 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
tests/rpmostree_rebase.pm
View File

@ -62,19 +62,9 @@ sub run {
validate_script_output "rpm-ostree status -b", sub { m/$target/ }, 300; validate_script_output "rpm-ostree status -b", sub { m/$target/ }, 300;
# rollback and reboot # rollback and reboot
if (get_var("ADVISORY") eq "FEDORA-2023-f6afa6f9e5") { validate_script_output "rpm-ostree rollback", sub { m/systemctl reboot/ }, 300;
# FIXME: workaround for a very odd phenomenon with this update script_run "systemctl reboot", 0;
# https://bodhi.fedoraproject.org/updates/FEDORA-2023-f6afa6f9e5#comment-2919613 boot_to_login_screen;
# if that keeps happening after the update is stable we will
# have to do this for all affected releases
script_run "rpm-ostree rollback && systemctl reboot", 0;
boot_to_login_screen(timeout => 450);
}
else {
validate_script_output "rpm-ostree rollback", sub { m/systemctl reboot/ }, 300;
script_run "systemctl reboot", 0;
boot_to_login_screen;
}
$self->root_console(tty => 3); $self->root_console(tty => 3);
# check to make sure rollback successful # check to make sure rollback successful