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

ostree: avoid rebasing from F39+ to <F39

Browse Source 
Now F39 has branched from Rawhide, we can tweak the rebase logic
to never rebase from F39+ to <F39, and avoid
https://github.com/fedora-silverblue/issue-tracker/issues/470 .

Signed-off-by: Adam Williamson <awilliam@redhat.com>
This commit is contained in:
Adam Williamson 2023-08-23 16:12:57 -07:00
parent f1a6c91784
commit f22af41f0f
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
tests/rpmostree_rebase.pm
View File

@ -33,12 +33,21 @@ sub run {
my $rebase; my $rebase;
my $target; my $target;
if ($current =~ "iot") { if ($current =~ "iot") {
$rebase = $current =~ "stable" ? "devel" : "stable"; # previously we did this:
#$rebase = $current =~ "stable" ? "devel" : "stable";
# but we cannot rebase from F39+ to <F39:
# https://github.com/fedora-silverblue/issue-tracker/issues/470
# so let's make sure we don't do that. This can be reverted
# when F39 is stable
$rebase = $current =~ "devel" ? "rawhide" : "devel";
$target = "fedora/${rebase}/${arch}/iot"; $target = "fedora/${rebase}/${arch}/iot";
} }
elsif ($current =~ "silverblue") { elsif ($current =~ "silverblue") {
my $relnum = get_release_number; my $relnum = get_release_number;
$rebase = $relnum - 1; $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 # on update tests, just rebase to the 'official' ref for the
# release, as opposed to the custom ref we used when building; # release, as opposed to the custom ref we used when building;
# this should be more reliable than a different release # this should be more reliable than a different release