From e2706b90f39d25299a031bbeef5facad8d7314b2 Mon Sep 17 00:00:00 2001
From: Colin Walters <walters@verbum.org>
Date: Thu, 12 Oct 2023 18:24:00 -0400
Subject: [PATCH] tests: Use ext4, re-enable composefs test

Until the XFS fsverity stuff lands.
---
 .cci.jenkinsfile               | 2 ++
 ci/prow/fcos-e2e.sh            | 2 ++
 tests/inst/src/composefs.rs    | 1 -
 tests/inst/src/insttestmain.rs | 2 +-
 4 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/.cci.jenkinsfile b/.cci.jenkinsfile
index 82e2d1ac84..a267f27d61 100644
--- a/.cci.jenkinsfile
+++ b/.cci.jenkinsfile
@@ -60,6 +60,8 @@ cosaPod(runAsUser: 0, memory: "9Gi", cpu: "4") {
       mv installed/rootfs/* overrides/rootfs/
       rm installed -rf
       coreos-assembler fetch
+      # For composefs
+      echo 'rootfs: "ext4verity"' >> src/config/image.yaml
       coreos-assembler build
       coreos-assembler buildextend-metal
       coreos-assembler buildextend-metal4k
diff --git a/ci/prow/fcos-e2e.sh b/ci/prow/fcos-e2e.sh
index 3151898b00..f076f31eea 100755
--- a/ci/prow/fcos-e2e.sh
+++ b/ci/prow/fcos-e2e.sh
@@ -10,6 +10,8 @@ cd $(mktemp -d)
 cosa init https://github.com/coreos/fedora-coreos-config/
 rsync -rlv /cosa/component-install/ overrides/rootfs/
 cosa fetch
+# For composefs
+echo 'rootfs: "ext4verity"' >> src/config/image.yaml
 cosa build
 # For now, Prow just runs the composefs tests, since Jenkins covers the others
 #cosa kola run 'ext.ostree.destructive-rs.composefs*'
diff --git a/tests/inst/src/composefs.rs b/tests/inst/src/composefs.rs
index 219b9e12be..4e0ad66efe 100644
--- a/tests/inst/src/composefs.rs
+++ b/tests/inst/src/composefs.rs
@@ -131,7 +131,6 @@ fn verify_composefs_signed(sh: &xshell::Shell, metadata: &glib::VariantDict) ->
     Ok(())
 }
 
-#[allow(dead_code)]
 pub(crate) fn itest_composefs() -> Result<()> {
     let sh = &xshell::Shell::new()?;
     if !cmd!(sh, "ostree --version").read()?.contains("- composefs") {
diff --git a/tests/inst/src/insttestmain.rs b/tests/inst/src/insttestmain.rs
index 2da35ffed5..1613385cd5 100644
--- a/tests/inst/src/insttestmain.rs
+++ b/tests/inst/src/insttestmain.rs
@@ -33,7 +33,7 @@ const TESTS: &[StaticTest] = &[
 ];
 const DESTRUCTIVE_TESTS: &[StaticTest] = &[
     test!(destructive::itest_transactionality),
-    // test!(composefs::itest_composefs),
+    test!(composefs::itest_composefs),
 ];
 
 #[derive(Debug, StructOpt)]