From 734ea3ee379591a5e2e56f83319c5be01e17e952 Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Wed, 11 Oct 2023 08:15:25 -0400 Subject: [PATCH] ci: Disable composefs test for now Need to change the framework to boot with an Ignition config that switches to ext4 soon. --- ci/prow/fcos-e2e.sh | 2 +- tests/inst/src/composefs.rs | 1 + tests/inst/src/insttestmain.rs | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/ci/prow/fcos-e2e.sh b/ci/prow/fcos-e2e.sh index 9d42dcce45..3151898b00 100755 --- a/ci/prow/fcos-e2e.sh +++ b/ci/prow/fcos-e2e.sh @@ -12,4 +12,4 @@ rsync -rlv /cosa/component-install/ overrides/rootfs/ cosa fetch cosa build # For now, Prow just runs the composefs tests, since Jenkins covers the others -cosa kola run 'ext.ostree.destructive-rs.composefs*' +#cosa kola run 'ext.ostree.destructive-rs.composefs*' diff --git a/tests/inst/src/composefs.rs b/tests/inst/src/composefs.rs index 4e0ad66efe..219b9e12be 100644 --- a/tests/inst/src/composefs.rs +++ b/tests/inst/src/composefs.rs @@ -131,6 +131,7 @@ 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 1613385cd5..2da35ffed5 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)]