DNM: still fighting tmt-reboot...

Author: jmarrero

tmt/tests/booted/test-soft-reboot.nu

@@ -11,8 +11,6 @@ if not $soft_reboot_capable {
 # This code runs on *each* boot.
 # Here we just capture information.
 bootc status
-let st = bootc status --json | from json
-let booted = $st.status.booted.image
 
 # Run on the first boot
 def initial_build [] {
@@ -34,25 +32,16 @@ RUN echo test content > /usr/share/testfile-for-soft-reboot.txt
     let st = bootc status --json | from json
     assert $st.status.staged.softRebootCapable
 
-    # And reboot into it
-    tmt-reboot
+    # And reboot into it using systemctl to ensure soft-reboot get's called
+    # https://tmt.readthedocs.io/en/stable/stories/features.html#reboot-during-test
+    tmt-reboot -c "systemctl soft-reboot"
 }
 
 # The second boot; verify we're in the derived image
 def second_boot [] {
     assert ("/usr/share/testfile-for-soft-reboot.txt" | path exists)
 
     assert equal (systemctl show -P SoftRebootsCount) "1"
-}
-
-# Run on the second boot
-def second_build [] {
-    tap begin "local image push + pull + upgrade"
-
-    let td = mktemp -d
-    cd $td
-
-    bootc image copy-to-storage
 
     # A new derived with new kargs which should stop the soft reboot.
     "FROM localhost/bootc
@@ -62,8 +51,9 @@ RUN echo 'kargs = ["foo1=bar2"]' | tee /usr/lib/bootc/kargs.d/00-foo1bar2.toml >
     # Build it
     podman build -t localhost/bootc-derived .
 
-    bootc update --queue-soft-reboot --transport containers-storage
+    bootc update --queue-soft-reboot
     let st = bootc status --json | from json
+    # Should not be soft-reboot capable because of kargs diff
     assert (not $st.status.staged.softRebootCapable)
 
     # And reboot into it
@@ -82,8 +72,7 @@ def main [] {
     match $env.TMT_REBOOT_COUNT? {
         null | "0" => initial_build,
         "1" => second_boot,
-        "2" => second_build,
-        "3" => third_boot,
+        "2" => third_boot,
         $o => { error make { msg: $"Invalid TMT_REBOOT_COUNT ($o)" } },
     }
 }