From 2f76b03089f521ac52f70b7b54379761c033fbb8 Mon Sep 17 00:00:00 2001
From: Colin Walters <walters@verbum.org>
Date: Thu, 5 Oct 2023 19:54:54 -0400
Subject: [PATCH 1/2] ci: Ensure composefs+openssl are is enabled on Fedora

For some reason we're not picking this up in the Prow build,
which breaks things because now rpm-ostree hard requires it.

Let's make this a fatal build time error for more clear
debugging.
---
 ci/build.sh    | 3 +++
 ci/libbuild.sh | 1 +
 2 files changed, 4 insertions(+)

diff --git a/ci/build.sh b/ci/build.sh
index 4860565845..18bc529aaf 100755
--- a/ci/build.sh
+++ b/ci/build.sh
@@ -20,6 +20,9 @@ if test "${OS_ID}" = 'fedora'; then
         *) CONFIGOPTS="${CONFIGOPTS:-} --with-curl"
     esac
 fi
+if [[ "${OS_ID_LIKE}" =~ rhel|fedora ]]; then
+    CONFIGOPTS="${CONFIGOPTS:-} --with-composefs --with-openssl"
+fi
 case "${CONFIGOPTS:-}" in
     *--with-curl*|--with-soup*)
         if test -x /usr/bin/gnome-desktop-testing-runner; then
diff --git a/ci/libbuild.sh b/ci/libbuild.sh
index 9938e282fa..76bdf096be 100644
--- a/ci/libbuild.sh
+++ b/ci/libbuild.sh
@@ -3,6 +3,7 @@
 dn=$(cd $(dirname $0) && pwd)
 
 OS_ID=$(. /etc/os-release; echo $ID)
+OS_ID_LIKE=$(. /etc/os-release; echo $ID ${ID_LIKE:-})
 OS_VERSION_ID=$(. /etc/os-release; echo $VERSION_ID)
 
 pkg_upgrade() {

From 734ea3ee379591a5e2e56f83319c5be01e17e952 Mon Sep 17 00:00:00 2001
From: Colin Walters <walters@verbum.org>
Date: Wed, 11 Oct 2023 08:15:25 -0400
Subject: [PATCH 2/2] 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)]