1
0
mirror of https://pagure.io/fedora-qa/os-autoinst-distri-fedora.git synced 2024-11-22 14:03:09 +00:00

Revert "rpmostree_rebase: avoid rebasing Silverblue to 38 for now"

This reverts commit d0d37e6aca.
Turns out rebase still fails even with 37 as the target.
This commit is contained in:
Adam Williamson 2023-02-16 20:36:03 -08:00
parent d0d37e6aca
commit 05f13a002d

View File

@ -30,14 +30,8 @@ sub run {
my $relnum = get_release_number; my $relnum = get_release_number;
$rebase = $relnum - 1; $rebase = $relnum - 1;
# avoid rebasing from 37 to <37, bad stuff happens # avoid rebasing from 37 to <37, bad stuff happens
# FIXME when # FIXME when 38 branches, we should change this to RELNUM+1
# https://github.com/fedora-silverblue/issue-tracker/issues/420
# is fixed we should change this to 38
$rebase = "rawhide" if ($relnum eq "37"); $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"; $target = "fedora/${rebase}/${arch}/silverblue";
} }
elsif ($current =~ "coreos") { elsif ($current =~ "coreos") {