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() { 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)]