Tmt early exits

tmt/plans/integration.fmf

@@ -284,19 +284,21 @@ execute:
     test:
       - /tmt/tests/tests/test-44-shadow-fixup
 
-/plan-45-composefs-corruped-state-resilience:
+/plan-45-composefs-corrupted-state-resilience:
   summary: Test composefs backend resilience to state corruption
   discover:
     how: fmf
     test:
-      - /tmt/tests/tests/test-45-composefs-corruped-state-resilience
+      - /tmt/tests/tests/test-45-composefs-corrupted-state-resilience
+  extra-skip_if_ostree: true
 
 /plan-46-etc-merge-conflict:
   summary: Verify etc merge conflicts are caught during upgrade, not finalization
   discover:
     how: fmf
     test:
       - /tmt/tests/tests/test-46-etc-merge-conflict
+  extra-skip_if_ostree: true
 
 /plan-47-download-only-switch:
   summary: Execute download-only switch tests
@@ -311,4 +313,5 @@ execute:
     how: fmf
     test:
       - /tmt/tests/tests/test-48-composefs-uki-dumpfile
+  extra-skip_if_ostree: true
 # END GENERATED PLANS

tmt/tests/booted/test-composefs-corruped-state-resilience.nu → tmt/tests/booted/test-composefs-corrupted-state-resilience.nu

@@ -2,14 +2,12 @@
 # tmt:
 #   summary: Test composefs backend resilience to state corruption
 #   duration: 30m
+# extra:
+#   skip_if_ostree: true
 
 use std assert
 use tap.nu
 
-if not (tap is_composefs) {
-    exit 0
-}
-
 let st = bootc status --json | from json
 let booted = $st.status.booted.image
 let is_uki = ($st.status.booted.composefs.bootType | str downcase) == "uki"

tmt/tests/booted/test-composefs-gc-uki.nu

@@ -8,10 +8,6 @@
 use std assert
 use tap.nu
 
-if not (tap is_composefs) {
-    exit 0
-}
-
 # bootc status
 let st = bootc status --json | from json
 let booted = $st.status.booted.image

tmt/tests/booted/test-composefs-gc.nu

@@ -9,20 +9,12 @@
 use std assert
 use tap.nu
 
-if not (tap is_composefs) {
-    exit 0
-}
-
 # bootc status
 let st = bootc status --json | from json
 let booted = $st.status.booted.image
 
 let dir_prefix = "bootc_composefs-"
 
-if ($st.status.booted.composefs.bootType | str downcase) == "uki" {
-    exit 0
-}
-
 # Create a large file in a new container image, then bootc switch to the image
 def first_boot [] {
     bootc image copy-to-storage

tmt/tests/booted/test-composefs-uki-dumpfile.nu

@@ -2,14 +2,12 @@
 # tmt:
 #   summary: Test composefs UKI dumpfile diff print
 #   duration: 30m
+# extra:
+#   skip_if_ostree: true
 
 use std assert
 use tap.nu
 
-if not (tap is_composefs) {
-    exit 0
-}
-
 # bootc status
 let st = bootc status --json | from json
 let booted = $st.status.booted.image

tmt/tests/booted/test-etc-merge-conflict.nu

@@ -2,6 +2,8 @@
 # tmt:
 #   summary: Verify etc merge conflicts are caught during upgrade, not finalization
 #   duration: 15m
+# extra:
+#   skip_if_ostree: true
 #
 # Verifies that file-to-directory and directory-to-file type changes between
 # the current /etc and the new image's /etc are detected during `bootc switch`
@@ -12,10 +14,6 @@
 use std assert
 use tap.nu
 
-if not (tap is_composefs) {
-    exit 0
-}
-
 tap begin "etc merge conflict detection during upgrade"
 
 def main [] {

tmt/tests/booted/test-switch-same-digest.nu

@@ -12,10 +12,6 @@
 use std assert
 use tap.nu
 
-if not (tap is_composefs) {
-    exit 0
-}
-
 tap begin "bootc switch to same-digest image must error"
 
 # Copy the booted image into podman storage so we can retag it.

tmt/tests/tests.fmf

@@ -174,10 +174,10 @@ check:
   duration: 30m
   test: nu booted/test-44-shadow-fixup.nu
 
-/test-45-composefs-corruped-state-resilience:
+/test-45-composefs-corrupted-state-resilience:
   summary: Test composefs backend resilience to state corruption
   duration: 30m
-  test: nu booted/test-composefs-corruped-state-resilience.nu
+  test: nu booted/test-composefs-corrupted-state-resilience.nu
 
 /test-46-etc-merge-conflict:
   summary: Verify etc merge conflicts are caught during upgrade, not finalization