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..fa6d3d374a 100644 --- a/tests/inst/src/composefs.rs +++ b/tests/inst/src/composefs.rs @@ -131,15 +131,21 @@ 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") { - println!("SKIP no composefs support"); - return Ok(()); - } let mark = match crate::test::get_reboot_mark()? { None => { + if !cmd!(sh, "ostree --version").read()?.contains("- composefs") { + println!("SKIP no composefs support"); + return Ok(()); + } + { + let fstype = cmd!(sh, "stat -f / -c %T").read()?; + if fstype.trim() == "xfs" { + println!("SKIP no xfs fsverity yet"); + return Ok(()); + } + } cmd!( sh, "ostree --repo=/ostree/repo config set ex-integrity.composefs true" 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)]