From e43faa5855b3b7e18f00c3589c3db8c250eafc4d Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Thu, 28 Nov 2024 13:48:09 -0800 Subject: [PATCH] F39 EOL cleanup: remove one F38/F39 workaround from ostree rebase The other is a bit more risky, will test and do that one later, separately. Signed-off-by: Adam Williamson --- tests/rpmostree_rebase.pm | 4 ---- 1 file changed, 4 deletions(-) diff --git a/tests/rpmostree_rebase.pm b/tests/rpmostree_rebase.pm index c2af8412..533dd72d 100644 --- a/tests/rpmostree_rebase.pm +++ b/tests/rpmostree_rebase.pm @@ -44,10 +44,6 @@ sub run { } elsif ($current =~ "silverblue") { my $relnum = get_release_number; - $rebase = $relnum - 1; - # avoid rebasing 39 > 38 due to - # https://github.com/fedora-silverblue/issue-tracker/issues/470 - $rebase = "40" if ($rebase eq "38"); # on update tests, just rebase to the 'official' ref for the # release, as opposed to the custom ref we used when building; # this should be more reliable than a different release