Add composefs tests

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

Author: Johan-Liebert1

.github/workflows/ci.yml

@@ -154,7 +154,7 @@ jobs:
       matrix:
         # No fedora-44 due to https://bugzilla.redhat.com/show_bug.cgi?id=2429501
         test_os: [fedora-42, fedora-43, centos-9, centos-10]
-        variant: [ostree, composefs-sealeduki-sdboot]
+        variant: [composefs]
         exclude:
           # centos-9 UKI is experimental/broken (https://github.com/bootc-dev/bootc/issues/1812)
           - test_os: centos-9
@@ -201,6 +201,8 @@ jobs:
       - name: Run TMT integration tests
         run: |
           if [ "${{ matrix.variant }}" = "composefs-sealeduki-sdboot" ]; then
+            just test-composefs-sealeduki-sdboot
+          elif [ "${{ matrix.variant }}" = "composefs" ]; then
             just test-composefs
           else
             just test-tmt integration

Justfile

@@ -122,9 +122,13 @@ package:
     # Keep localhost/bootc-pkg for layer caching; use `just clean-local-images` to reclaim space
 
 # Build+test using the `composefs-sealeduki-sdboot` variant.
-test-composefs:
+test-composefs-sealeduki-sdboot:
     just variant=composefs-sealeduki-sdboot test-tmt readonly local-upgrade-reboot
 
+test-composefs:
+    just variant=composefs test-tmt --composefs-backend readonly image-upgrade-reboot \
+    download-only image-pushpull-upgrade install-outside-container soft-reboot usroverlay
+
 # Only used by ci.yml right now
 build-install-test-image: build
     cd hack && podman build {{base_buildargs}} -t {{base_img}}-install -f Containerfile.drop-lbis

crates/tests-integration/src/container.rs

@@ -8,7 +8,7 @@ use anyhow::{Context, Result};
 use camino::Utf8Path;
 use fn_error_context::context;
 use libtest_mimic::Trial;
-use xshell::{Shell, cmd};
+use xshell::{cmd, Shell};
 
 fn new_test(description: &'static str, f: fn() -> anyhow::Result<()>) -> libtest_mimic::Trial {
     Trial::test(description, move || f().map_err(Into::into))
@@ -52,8 +52,8 @@ pub(crate) fn test_bootc_container_inspect() -> Result<()> {
         .expect("kernel.unified should be a boolean");
     if let Some(variant) = std::env::var("BOOTC_variant").ok() {
         match variant.as_str() {
-            "ostree" => {
-                assert!(!unified, "Expected unified=false for ostree variant");
+            v @ "ostree" | v @ "composefs" => {
+                assert!(!unified, "Expected unified=false for variant {v}");
                 // For traditional kernels, version should look like a uname (contains digits)
                 assert!(
                     version.chars().any(|c| c.is_ascii_digit()),
@@ -146,7 +146,7 @@ fn test_variant_base_crosscheck() -> Result<()> {
             "ostree" => {
                 assert!(!boot_efi.try_exists()?);
             }
-            "composefs-sealeduki-sdboot" => {
+            "composefs" | "composefs-sealeduki-sdboot" => {
                 assert!(boot_efi.try_exists()?);
             }
             o => panic!("Unhandled variant: {o}"),

crates/xtask/src/buildsys.rs

@@ -5,7 +5,7 @@ use std::collections::BTreeMap;
 use anyhow::{Context, Result};
 use camino::{Utf8Path, Utf8PathBuf};
 use fn_error_context::context;
-use xshell::{Shell, cmd};
+use xshell::{cmd, Shell};
 
 const DOCKERFILE_NETWORK_CUTOFF: &str = "external dependency cutoff point";
 

crates/xtask/src/man.rs

@@ -8,7 +8,7 @@ use camino::Utf8Path;
 use fn_error_context::context;
 use serde::{Deserialize, Serialize};
 use std::{fs, io::Write};
-use xshell::{Shell, cmd};
+use xshell::{cmd, Shell};
 
 /// Represents a CLI option extracted from the JSON dump
 #[derive(Debug, Serialize, Deserialize)]

crates/xtask/src/tmt.rs

@@ -2,7 +2,7 @@ use anyhow::{Context, Result};
 use camino::{Utf8Path, Utf8PathBuf};
 use fn_error_context::context;
 use rand::Rng;
-use xshell::{Shell, cmd};
+use xshell::{cmd, Shell};
 
 // Generation markers for integration.fmf
 const PLAN_MARKER_BEGIN: &str = "# BEGIN GENERATED PLANS\n";
@@ -29,6 +29,8 @@ const ENV_BOOTC_UPGRADE_IMAGE: &str = "BOOTC_upgrade_image";
 // Distro identifiers
 const DISTRO_CENTOS_9: &str = "centos-9";
 
+const COMPOSEFS_KERNEL_ARGS: [&str; 1] = ["--karg=enforcing=0"];
+
 // Import the argument types from xtask.rs
 use crate::{RunTmtArgs, TmtProvisionArgs};
 
@@ -390,6 +392,7 @@ pub(crate) fn run_tmt(sh: &Shell, args: &RunTmtArgs) -> Result<()> {
         println!("\n========================================");
         println!("Running plan: {}", plan);
         println!("VM name: {}", vm_name);
+        println!("args: {args:#?}");
         println!("========================================\n");
 
         // Reset plan-specific environment variables
@@ -430,6 +433,13 @@ pub(crate) fn run_tmt(sh: &Shell, args: &RunTmtArgs) -> Result<()> {
                     opts.push("--filesystem=xfs".to_string());
                 }
             }
+
+            if args.composefs_backend {
+                opts.push("--filesystem=ext4".into());
+                opts.push("--composefs-backend".into());
+                opts.extend(COMPOSEFS_KERNEL_ARGS.map(|x| x.into()));
+            }
+
             opts
         };
 

crates/xtask/src/xtask.rs

@@ -12,7 +12,7 @@ use anyhow::{Context, Result};
 use camino::{Utf8Path, Utf8PathBuf};
 use clap::{Args, Parser, Subcommand};
 use fn_error_context::context;
-use xshell::{Shell, cmd};
+use xshell::{cmd, Shell};
 
 mod buildsys;
 mod man;
@@ -81,6 +81,9 @@ pub(crate) struct RunTmtArgs {
     /// Preserve VMs after test completion (useful for debugging)
     #[arg(long)]
     pub(crate) preserve_vm: bool,
+
+    #[arg(long)]
+    pub(crate) composefs_backend: bool,
 }
 
 /// Arguments for tmt-provision command

hack/build-sealed

@@ -19,7 +19,7 @@ runv() {
 }
 
 case $variant in
-  ostree)
+  ostree|composefs)
     # Nothing to do
     echo "Not building a sealed image; forwarding tag"
     runv podman tag $input_image $output_image

tmt/tests/booted/test-image-pushpull-upgrade.nu

@@ -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