From d964129736b4a2f1a4692002bc74c9d91e251fee Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Mon, 12 Jun 2023 08:56:26 -0700 Subject: [PATCH] ostree rebase: drop an old unneeded workaround Signed-off-by: Adam Williamson --- tests/rpmostree_rebase.pm | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/tests/rpmostree_rebase.pm b/tests/rpmostree_rebase.pm index 24668706..d00de387 100644 --- a/tests/rpmostree_rebase.pm +++ b/tests/rpmostree_rebase.pm @@ -62,19 +62,9 @@ sub run { validate_script_output "rpm-ostree status -b", sub { m/$target/ }, 300; # rollback and reboot - if (get_var("ADVISORY") eq "FEDORA-2023-f6afa6f9e5") { - # FIXME: workaround for a very odd phenomenon with this update - # https://bodhi.fedoraproject.org/updates/FEDORA-2023-f6afa6f9e5#comment-2919613 - # 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; - } + 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); # check to make sure rollback successful