From 05f13a002d3e1f7e65d7e1ebe60add872e4aa82e Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Thu, 16 Feb 2023 20:36:03 -0800 Subject: [PATCH] Revert "rpmostree_rebase: avoid rebasing Silverblue to 38 for now" This reverts commit d0d37e6aca457ef4acd529fe0c80f7ab02615ff8. Turns out rebase still fails even with 37 as the target. --- tests/rpmostree_rebase.pm | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/tests/rpmostree_rebase.pm b/tests/rpmostree_rebase.pm index 5505a6ad..7138ebab 100644 --- a/tests/rpmostree_rebase.pm +++ b/tests/rpmostree_rebase.pm @@ -30,14 +30,8 @@ sub run { my $relnum = get_release_number; $rebase = $relnum - 1; # avoid rebasing from 37 to <37, bad stuff happens - # FIXME when - # https://github.com/fedora-silverblue/issue-tracker/issues/420 - # is fixed we should change this to 38 + # FIXME when 38 branches, we should change this to RELNUM+1 $rebase = "rawhide" if ($relnum eq "37"); - # FIXME: avoid rebasing to 38 until - # https://github.com/fedora-silverblue/issue-tracker/issues/420 - # is fixed - $rebase = "37" if ($rebase eq "38"); $target = "fedora/${rebase}/${arch}/silverblue"; } elsif ($current =~ "coreos") {