composefs/tests: Add tests for filesystems

Add filesystems ext4 and xfs in github CI matrix so that we test systems
with and without fs-verity enabled

Signed-off-by: Pragyan Poudyal <pragyanpoudyal41999@gmail.com>

Author: Johan-Liebert1

.github/workflows/ci.yml

@@ -162,6 +162,7 @@ jobs:
         # No fedora-44 due to https://bugzilla.redhat.com/show_bug.cgi?id=2429501
         test_os: [fedora-43, centos-9, centos-10]
         variant: [ostree, composefs-sealeduki-sdboot, composefs-sdboot, composefs-grub]
+        filesystem: ["ext4", "xfs"]
         exclude:
           # centos-9 UKI is experimental/broken (https://github.com/bootc-dev/bootc/issues/1812)
           - test_os: centos-9
@@ -172,6 +173,10 @@ jobs:
             variant: composefs-sdboot
           - test_os: centos-9
             variant: composefs-grub
+          # We only test filesystems for composefs to test if composefs backend will work on fs
+          # without fsverity
+          - variant: ostree
+            filesystem: ext4
 
     runs-on: ubuntu-24.04
 
@@ -190,6 +195,7 @@ jobs:
           echo "BOOTC_base=${BASE}" >> $GITHUB_ENV
           echo "RUST_BACKTRACE=full" >> $GITHUB_ENV
           echo "RUST_LOG=trace" >> $GITHUB_ENV
+          echo "BOOTC_filesystem=${{ matrix.filesystem }}" >> $GITHUB_ENV
 
           case "${{ matrix.variant }}" in
             composefs-grub)
@@ -213,8 +219,6 @@ jobs:
             ;;
           esac
 
-
-
           if [ "${{ matrix.variant }}" = "composefs-sealeduki-sdboot" ]; then
             BUILDROOTBASE=$(just pullspec-for-os buildroot-base ${{ matrix.test_os }})
             echo "BOOTC_buildroot_base=${BUILDROOTBASE}" >> $GITHUB_ENV
@@ -244,7 +248,7 @@ jobs:
       - name: Run TMT integration tests
         run: |
           if [[ "${{ matrix.variant }}" = composefs* ]]; then
-            just "test-${{ matrix.variant }}"
+            just "test-${{ matrix.variant }}" "${{ matrix.filesystem }}"
           else
             just test-tmt integration
           fi
@@ -255,7 +259,7 @@ jobs:
         if: always()
         uses: actions/upload-artifact@v6
         with:
-          name: tmt-log-PR-${{ github.event.number }}-${{ matrix.test_os }}-${{ matrix.variant }}-${{ env.ARCH }}
+          name: tmt-log-PR-${{ github.event.number }}-${{ matrix.test_os }}-${{ matrix.variant }}-${{ matrix.filesystem }}-${{ env.ARCH }}
           path: /var/tmp/tmt
 
   # Test bootc install on Fedora CoreOS (separate job to avoid disk space issues

Justfile

@@ -21,6 +21,8 @@ upgrade_img := base_img + "-upgrade"
 # Build variant: ostree (default) or composefs-sealeduki-sdboot (sealed UKI)
 variant := env("BOOTC_variant", "ostree")
 bootloader := env("BOOTC_bootloader", "grub")
+# Only used for composefs tests
+filesystem := env("BOOTC_filesystem", "ext4")
 # Base container image to build from
 base := env("BOOTC_base", "quay.io/centos-bootc/centos-bootc:stream10")
 # Buildroot base image
@@ -106,23 +108,26 @@ test-container: build build-units
 
 # Build and test sealed composefs images
 [group('core')]
-test-composefs-sealeduki-sdboot:
-    just variant=composefs-sealeduki-sdboot test-tmt readonly local-upgrade-reboot
+test-composefs-sealeduki-sdboot filesystem:
+    just variant=composefs-sealeduki-sdboot filesystem={{filesystem}} test-tmt readonly local-upgrade-reboot
 
 [group('core')]
-test-composefs bootloader:
-    just variant=composefs bootloader={{bootloader}} \
-        test-tmt --composefs-backend --bootloader {{bootloader}} integration
+test-composefs bootloader filesystem:
+    just variant=composefs bootloader={{bootloader}} filesystem={{filesystem}} \
+        test-tmt --composefs-backend \
+            --bootloader {{bootloader}} \
+            --filesystem {{filesystem}} \
+            integration
 
 # Build and test composefs images booted using Type1 boot entries and systemd-boot as the bootloader
 [group('core')]
-test-composefs-sdboot:
-    just test-composefs systemd
+test-composefs-sdboot filesystem:
+    just test-composefs systemd {{filesystem}}
 
 # Build and test composefs images booted using Type1 boot entries and grub as the bootloader
 [group('core')]
-test-composefs-grub:
-    just test-composefs grub
+test-composefs-grub filesystem:
+    just test-composefs grub {{filesystem}}
 
 # Run cargo fmt and clippy checks in container
 [group('core')]

crates/xtask/src/tmt.rs

@@ -485,10 +485,15 @@ pub(crate) fn run_tmt(sh: &Shell, args: &RunTmtArgs) -> Result<()> {
             }
 
             if args.composefs_backend {
-                // TODO(Johan-Liebert1): Filesystem should be a parameter and we should test
-                // insecure with xfs
-                opts.push("--filesystem=ext4".into());
+                let filesystem = args.filesystem.as_deref().unwrap_or("ext4");
+                opts.push(format!("--filesystem={}", filesystem));
                 opts.push("--composefs-backend".into());
+
+                if filesystem == "xfs" {
+                    // As xfs doesn't support fsverity
+                    opts.push("--allow-missing-verity".into());
+                }
+
                 opts.extend(COMPOSEFS_KERNEL_ARGS.map(|x| x.into()));
             }
 

crates/xtask/src/xtask.rs

@@ -127,6 +127,9 @@ pub(crate) struct RunTmtArgs {
 
     #[arg(long, requires = "composefs_backend")]
     pub(crate) bootloader: Option<Bootloader>,
+
+    #[arg(long, requires = "composefs_backend")]
+    pub(crate) filesystem: Option<String>,
 }
 
 /// Arguments for tmt-provision command