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

Revert "Try and workaround IoT rebase problems with F37 read-only change"

Browse Source 
This reverts commit 093da03139.
As the comment says, this should be safe now F37 is stable.
This commit is contained in:
Adam Williamson 2022-12-13 12:10:40 -08:00
parent 02136a80e1
commit 2023172c24
1 changed files with 8 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
tests/iot_rpmostree_rebase.pm
View File

@ -21,23 +21,6 @@ sub run {
unless (script_run "rpm-ostree status -b | grep stable") {
$rebase = "devel";
}
# FIXME special cases for read-only transition from 36 to 37
# we can drop these (revert the whole relevant commit) once
# 37 is stable
my $orig;
if (get_var("CURRREL") eq "36") {
if (get_var("VERSION") eq "37") {
# rebase to rawhide
$rebase = "rawhide";
$orig = "devel";
}
elsif (get_var("VERSION") eq "38") {
# rebase to devel
$rebase = "devel";
$orig = "rawhide";
}
}
# rebase to the appropriate release, arch
validate_script_output "rpm-ostree rebase fedora/${rebase}/${arch}/iot", sub { m/systemctl reboot/ }, 300;
script_run "systemctl reboot", 0;
@ -46,7 +29,12 @@ sub run {
$self->root_console(tty => 3);
# check booted branch to make sure successful rebase
validate_script_output "rpm-ostree status -b", sub { m/$rebase/ }, 300;
if ($rebase eq "devel") {
validate_script_output "rpm-ostree status -b", sub { m/devel/ }, 300;
}
if ($rebase eq "stable") {
validate_script_output "rpm-ostree status -b", sub { m/stable/ }, 300;
}
# rollback and reboot
validate_script_output "rpm-ostree rollback", sub { m/systemctl reboot/ }, 300;
@ -56,13 +44,10 @@ sub run {
$self->root_console(tty => 3);
# check to make sure rollback successful, also account for branched (devel)
if ($orig) {
validate_script_output "rpm-ostree status -b", sub { m/$orig/ }, 300;
}
elsif ($rebase eq "devel") {
if ($rebase eq "devel") {
validate_script_output "rpm-ostree status -b", sub { m/stable/ }, 300;
}
elsif ($rebase eq "stable") {
if ($rebase eq "stable") {
validate_script_output "rpm-ostree status -b", sub { m/rawhide|devel/ }, 300;
}
}