From 2023172c246f93fbeecb91172d798b5be7ca5fcd Mon Sep 17 00:00:00 2001
From: Adam Williamson <awilliam@redhat.com>
Date: Tue, 13 Dec 2022 12:10:40 -0800
Subject: [PATCH] Revert "Try and workaround IoT rebase problems with F37
 read-only change"

This reverts commit 093da03139747a79ed8e4702212421338dfdba9b.
As the comment says, this should be safe now F37 is stable.
---
 tests/iot_rpmostree_rebase.pm | 31 ++++++++-----------------------
 1 file changed, 8 insertions(+), 23 deletions(-)

diff --git a/tests/iot_rpmostree_rebase.pm b/tests/iot_rpmostree_rebase.pm
index 1194f635..c34b312a 100644
--- a/tests/iot_rpmostree_rebase.pm
+++ b/tests/iot_rpmostree_rebase.pm
@@ -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;
     }
 }