shaba/ostree
1
0
Fork 0
mirror of https://github.com/ostreedev/ostree.git synced 2024-12-22 17:35:55 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #3067 from cgwalters/ci-composefs

Browse Source
This commit is contained in:
Jonathan Lebon 2023-10-11 12:03:39 -04:00 committed by GitHub
commit 6cce2e2381
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ci/build.sh
View File

@ -20,6 +20,9 @@ if test "${OS_ID}" = 'fedora'; then
*) CONFIGOPTS="${CONFIGOPTS:-} --with-curl" *) CONFIGOPTS="${CONFIGOPTS:-} --with-curl"
esac esac
fi fi
if [[ "${OS_ID_LIKE}" =~ rhel|fedora ]]; then
CONFIGOPTS="${CONFIGOPTS:-} --with-composefs --with-openssl"
fi
case "${CONFIGOPTS:-}" in case "${CONFIGOPTS:-}" in
*--with-curl*|--with-soup*) *--with-curl*|--with-soup*)
if test -x /usr/bin/gnome-desktop-testing-runner; then if test -x /usr/bin/gnome-desktop-testing-runner; then

1
ci/libbuild.sh
View File

@ -3,6 +3,7 @@
dn=$(cd $(dirname $0) && pwd) dn=$(cd $(dirname $0) && pwd)
OS_ID=$(. /etc/os-release; echo $ID) 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) OS_VERSION_ID=$(. /etc/os-release; echo $VERSION_ID)
pkg_upgrade() { pkg_upgrade() {

2
ci/prow/fcos-e2e.sh
View File

@ -12,4 +12,4 @@ rsync -rlv /cosa/component-install/ overrides/rootfs/
cosa fetch cosa fetch
cosa build cosa build
# For now, Prow just runs the composefs tests, since Jenkins covers the others # 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*'

1
tests/inst/src/composefs.rs
View File

@ -131,6 +131,7 @@ fn verify_composefs_signed(sh: &xshell::Shell, metadata: &glib::VariantDict) ->
Ok(()) Ok(())
} }
#[allow(dead_code)]
pub(crate) fn itest_composefs() -> Result<()> { pub(crate) fn itest_composefs() -> Result<()> {
let sh = &xshell::Shell::new()?; let sh = &xshell::Shell::new()?;
if !cmd!(sh, "ostree --version").read()?.contains("- composefs") { if !cmd!(sh, "ostree --version").read()?.contains("- composefs") {

2
tests/inst/src/insttestmain.rs
View File

@ -33,7 +33,7 @@ const TESTS: &[StaticTest] = &[
]; ];
const DESTRUCTIVE_TESTS: &[StaticTest] = &[ const DESTRUCTIVE_TESTS: &[StaticTest] = &[
test!(destructive::itest_transactionality), test!(destructive::itest_transactionality),
test!(composefs::itest_composefs), // test!(composefs::itest_composefs),
]; ];
#[derive(Debug, StructOpt)] #[derive(Debug, StructOpt)]