tmt/tests: Add composefs/ostree distinguishing checks

Johan-Liebert1 · cgwalters · commit 2c11d55a612c · 2026-02-11T09:47:03.000-05:00
The tests assume an ostree system right now, but we want the same tests
for composefs systems as well. Add a `is_composefs` function to
differentitate between the two backends during testing

Signed-off-by: Pragyan Poudyal &lt;pragyanpoudyal41999@gmail.com&gt;
diff --git a/tmt/tests/booted/readonly/001-test-status.nu b/tmt/tests/booted/readonly/001-test-status.nu
@@ -14,7 +14,7 @@ assert ($opts | any { |o| $o == "ro" }) "/sysroot should be mounted read-only"
 
 let st = bootc status --json | from json
 # Detect composefs by checking if composefs field is present
-let is_composefs = ($st.status.booted.composefs? != null)
+let is_composefs = (tap is_composefs)
 
 assert equal $st.apiVersion org.containers.bootc/v1
 
diff --git a/tmt/tests/booted/readonly/010-test-bootc-container-store.nu b/tmt/tests/booted/readonly/010-test-bootc-container-store.nu
@@ -5,7 +5,7 @@ tap begin "verify bootc-owned container storage"
 
 # Detect composefs by checking if composefs field is present
 let st = bootc status --json | from json
-let is_composefs = ($st.status.booted.composefs? != null)
+let is_composefs = (tap is_composefs)
 
 if $is_composefs {
     print "# TODO composefs: skipping test - /usr/lib/bootc/storage doesn't exist with composefs"
diff --git a/tmt/tests/booted/readonly/011-test-ostree-ext-cli.nu b/tmt/tests/booted/readonly/011-test-ostree-ext-cli.nu
@@ -8,7 +8,7 @@ tap begin "verify bootc wrapping ostree-ext"
 # Parse the status and get the booted image
 let st = bootc status --json | from json
 # Detect composefs by checking if composefs field is present
-let is_composefs = ($st.status.booted.composefs? != null)
+let is_composefs = (tap is_composefs)
 if $is_composefs {
     print "# TODO composefs: skipping test - ostree-container commands don't work with composefs"
 } else {
diff --git a/tmt/tests/booted/readonly/011-test-resolvconf.nu b/tmt/tests/booted/readonly/011-test-resolvconf.nu
@@ -6,7 +6,7 @@ tap begin "verify there's not an empty /etc/resolv.conf in the image"
 let st = bootc status --json | from json
 
 # Detect composefs by checking if composefs field is present
-let is_composefs = ($st.status.booted.composefs? != null)
+let is_composefs = (tap is_composefs)
 if $is_composefs {
     print "# TODO composefs: skipping test - ostree commands don't work with composefs"
 } else {
diff --git a/tmt/tests/booted/readonly/012-test-unit-status.nu b/tmt/tests/booted/readonly/012-test-unit-status.nu
@@ -6,7 +6,7 @@ tap begin "verify our systemd units"
 
 # Detect composefs by checking if composefs field is present
 let st = bootc status --json | from json
-let is_composefs = ($st.status.booted.composefs? != null)
+let is_composefs = (tap is_composefs)
 
 if $is_composefs {
     print "# TODO composefs: skipping test - bootc-status-updated.path watches /ostree/bootc which doesn't exist with composefs"
diff --git a/tmt/tests/booted/readonly/015-test-fsck.nu b/tmt/tests/booted/readonly/015-test-fsck.nu
@@ -5,7 +5,7 @@ tap begin "Run fsck"
 
 # Detect composefs by checking if composefs field is present
 let st = bootc status --json | from json
-let is_composefs = ($st.status.booted.composefs? != null)
+let is_composefs = (tap is_composefs)
 
 if $is_composefs {
     print "# TODO composefs: skipping test - fsck requires ostree-booted host"
diff --git a/tmt/tests/booted/readonly/017-test-bound-storage.nu b/tmt/tests/booted/readonly/017-test-bound-storage.nu
@@ -10,7 +10,7 @@ if not (bootc_testlib have_hostexports) {
 
 bootc status
 let st = bootc status --json | from json
-let is_composefs = ($st.status.booted.composefs? != null)
+let is_composefs = (tap is_composefs)
 if $is_composefs {
     # TODO we don't have imageDigest yet in status
     exit 0
diff --git a/tmt/tests/booted/readonly/030-test-composefs.nu b/tmt/tests/booted/readonly/030-test-composefs.nu
@@ -9,7 +9,7 @@ def parse_cmdline []  {
 
 # Detect composefs by checking if composefs field is present
 let st = bootc status --json | from json
-let is_composefs = ($st.status.booted.composefs? != null)
+let is_composefs = (tap is_composefs)
 let expecting_composefs = ($env.BOOTC_variant? | default "" | find "composefs") != null
 if $expecting_composefs {
     assert $is_composefs
diff --git a/tmt/tests/booted/tap.nu b/tmt/tests/booted/tap.nu
@@ -13,3 +13,8 @@ export def ok [] {
 export def fail [] {
   print "not ok"
 }
+
+export def is_composefs [] {
+    let st = bootc status --json | from json
+    $st.status.booted.composefs? != null
+}
diff --git a/tmt/tests/booted/test-image-pushpull-upgrade.nu b/tmt/tests/booted/test-image-pushpull-upgrade.nu
@@ -22,7 +22,7 @@ const quoted_karg = '"thisarg=quoted with spaces"'
 bootc status
 let st = bootc status --json | from json
 let booted = $st.status.booted.image
-let is_composefs = ($st.status.booted.composefs? != null)
+let is_composefs = (tap is_composefs)
 
 # Parse the kernel commandline into a list.
 # This is not a proper parser, but good enough
@@ -54,7 +54,11 @@ RUN echo test content > /usr/share/blah.txt
     let v = podman run --rm localhost/bootc-derived cat /usr/share/blah.txt | str trim
     assert equal $v "test content"
 
-    let orig_root_mtime = ls -Dl /ostree/bootc | get modified
+    mut orig_root_mtime = null;
+
+    if not $is_composefs {
+        $orig_root_mtime = ls -Dl /ostree/bootc | get modified
+    }
 
     # Now, fetch it back into the bootc storage!
     # We also test the progress API here
@@ -68,24 +72,25 @@ RUN echo test content > /usr/share/blah.txt
     systemd-run -u test-cat-progress -- /bin/bash -c $"exec cat ($progress_fifo) > ($progress_json)"
     # nushell doesn't do fd passing right now either, so run via bash
     bash -c $"bootc switch --progress-fd 3 --transport containers-storage localhost/bootc-derived 3>($progress_fifo)"
-    # Now, let's do some checking of the progress json
-    let progress = open --raw $progress_json | from json -o
-    sanity_check_switch_progress_json $progress
 
-    # Check that /run/reboot-required exists and is not empty
-    let rr_meta = (ls /run/reboot-required | first)
-    assert ($rr_meta.size > 0b)
+    if not $is_composefs {
+        # Now, let's do some checking of the progress json
+        let progress = open --raw $progress_json | from json -o
+        sanity_check_switch_progress_json $progress
 
-    # Verify that we logged to the journal
-    journalctl _MESSAGE_ID=3e2f1a0b9c8d7e6f5a4b3c2d1e0f9a8b7
+        # Check that /run/reboot-required exists and is not empty
+        let rr_meta = (ls /run/reboot-required | first)
+        assert ($rr_meta.size > 0b)
 
-    # The mtime should change on modification
-    let new_root_mtime = ls -Dl /ostree/bootc | get modified
-    assert ($new_root_mtime > $orig_root_mtime)
+        # Verify that we logged to the journal
+        journalctl _MESSAGE_ID=3e2f1a0b9c8d7e6f5a4b3c2d1e0f9a8b7
 
-    # Test for https://github.com/ostreedev/ostree/issues/3544
-    # Add a quoted karg using rpm-ostree if available
-    if not $is_composefs {
+        # The mtime should change on modification
+        let new_root_mtime = ls -Dl /ostree/bootc | get modified
+        assert ($new_root_mtime > $orig_root_mtime)
+
+        # Test for https://github.com/ostreedev/ostree/issues/3544
+        # Add a quoted karg using rpm-ostree if available
         # Check rpm-ostree and rpm-ostreed service status before run rpm-ostree
         # And collect info for flaky error "error: System transaction in progress"
         rpm-ostree status
diff --git a/tmt/tests/booted/test-install-to-filesystem-var-mount.sh b/tmt/tests/booted/test-install-to-filesystem-var-mount.sh
@@ -56,13 +56,13 @@ parted -s "$LOOP_DEV" mklabel gpt
 # BIOS boot partition (for GRUB on GPT)
 parted -s "$LOOP_DEV" mkpart primary 1MiB 2MiB
 parted -s "$LOOP_DEV" set 1 bios_grub on
-# EFI partition (200 MiB)
-parted -s "$LOOP_DEV" mkpart primary fat32 2MiB 202MiB
+# EFI partition (1 GiB)
+parted -s "$LOOP_DEV" mkpart primary fat32 2MiB 1026MiB
 parted -s "$LOOP_DEV" set 2 esp on
 # Boot partition (1 GiB)
-parted -s "$LOOP_DEV" mkpart primary ext4 202MiB 1226MiB
+parted -s "$LOOP_DEV" mkpart primary ext4 1026MiB 2052MiB
 # LVM partition (rest of disk)
-parted -s "$LOOP_DEV" mkpart primary 1226MiB 100%
+parted -s "$LOOP_DEV" mkpart primary 2052MiB 100%
 
 # Reload partition table
 partprobe "$LOOP_DEV"
@@ -114,6 +114,18 @@ echo "Filesystem layout:"
 mount | grep /var/mnt/target || true
 df -h /var/mnt/target /var/mnt/target/boot /var/mnt/target/boot/efi /var/mnt/target/var
 
+COMPOSEFS_BACKEND=()
+
+is_composefs=$(bootc status --json | jq '.status.booted.composefs')
+
+if [[ $is_composefs != "null" ]]; then
+    COMPOSEFS_BACKEND+=("--composefs-backend")
+    tune2fs -O verity /dev/BL/var02
+    tune2fs -O verity /dev/BL/root02
+fi
+
+echo "${COMPOSEFS_BACKEND[@]}"
+
 # Run bootc install to-filesystem from within the container image under test
 podman run \
     --rm --privileged \
@@ -124,16 +136,39 @@ podman run \
     "$TARGET_IMAGE" \
     bootc install to-filesystem \
         --disable-selinux \
+        "${COMPOSEFS_BACKEND[@]}" \
         --karg=root=UUID="$ROOT_UUID" \
         --root-mount-spec=UUID="$ROOT_UUID" \
         --boot-mount-spec=UUID="$BOOT_UUID" \
         /target
 
 # Verify the installation succeeded
 echo "Verifying installation..."
-test -d /var/mnt/target/ostree
-test -d /var/mnt/target/ostree/repo
-# Verify bootloader was installed (grub2 or loader for different configurations)
-test -d /var/mnt/target/boot/grub2 || test -d /var/mnt/target/boot/loader
+
+if [[ $is_composefs == "null" ]]; then
+    test -d /var/mnt/target/ostree
+    test -d /var/mnt/target/ostree/repo
+
+    # Verify bootloader was installed (grub2 or loader for different configurations)
+    test -d /var/mnt/target/boot/grub2 || test -d /var/mnt/target/boot/loader
+else
+    test -d /var/mnt/target/composefs
+
+    # TODO(Johan-Liebert1): This is getting bootloader from the VM, which is not quite correct
+    # It works for now as the CI runs separately for each bootloader, but we need to get the 
+    # bootloader from the installed systemd if we wish to run the tests locally without rebuilding the images
+    # This probably also happens in other tests, one instance is install-outside-container
+    bootloader=$(bootc status --json | jq '.status.booted.composefs.bootloader' | tr '[:upper:]' '[:lower:]')
+    bootloader=${bootloader//\"/}
+
+    if [[ $bootloader == "grub" ]]; then
+        test -d /var/mnt/target/boot/grub2 || test -d /var/mnt/target/boot/loader
+    else
+        test -d /var/mnt/target/boot/efi/EFI
+        test -d /var/mnt/target/boot/efi/loader/entries
+    fi
+
+fi
+
 
 echo "Installation to-filesystem with separate /var mount succeeded!"
diff --git a/tmt/tests/booted/test-soft-reboot.nu b/tmt/tests/booted/test-soft-reboot.nu
@@ -41,8 +41,13 @@ RUN echo test content > /usr/share/testfile-for-soft-reboot.txt
 
     assert ("/run/nextroot" | path exists)
 
-    # See ../bug-soft-reboot.md - TMT cannot handle systemd soft-reboots
-    ostree admin prepare-soft-reboot --reset
+    if not (tap is_composefs) {
+        # See ../bug-soft-reboot.md - TMT cannot handle systemd soft-reboots
+        ostree admin prepare-soft-reboot --reset
+    } else {
+        bootc internals prep-soft-reboot --reset
+    }
+
     # https://tmt.readthedocs.io/en/stable/stories/features.html#reboot-during-test
     tmt-reboot
 }
diff --git a/tmt/tests/booted/test-switch-mutate-in-place.nu b/tmt/tests/booted/test-switch-mutate-in-place.nu
@@ -9,9 +9,7 @@ use bootc_testlib.nu
 
 # See https://github.com/bootc-dev/bootc/issues/1854
 
-let st = bootc status --json | from json
-let is_composefs = ($st.status.booted.composefs? != null)
-if not $is_composefs {
+if not (tap is_composefs) {
     # This is aiming to reproduce an environment closer to the Anaconda case
     # where we're chrooted into a non-booted system. TODO: What we really want
     # is to add `bootc switch --sysroot` too.

Original file line number	Diff line number	Diff line change
`@@ -13,3 +13,8 @@ export def ok [] {`
`13`	`13`	`export def fail [] {`
`14`	`14`	`print "not ok"`
`15`	`15`	`}`
	`16`	`+`
	`17`	`+export def is_composefs [] {`
	`18`	`+ let st = bootc status --json \| from json`
	`19`	`+ $st.status.booted.composefs? != null`
	`20`	`+}`