Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ci: Ensure composefs is enabled on Fedora #3067

Merged
merged 2 commits into from
Oct 11, 2023
Merged

ci: Ensure composefs is enabled on Fedora #3067

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2f76b03
ci: Ensure composefs+openssl are is enabled on Fedora
cgwalters Oct 5, 2023
734ea3e
ci: Disable composefs test for now
cgwalters Oct 11, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions ci/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions ci/libbuild.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down
2 changes: 1 addition & 1 deletion ci/prow/fcos-e2e.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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*'
1 change: 1 addition & 0 deletions tests/inst/src/composefs.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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") {
Expand Down
2 changes: 1 addition & 1 deletion tests/inst/src/insttestmain.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)]
Expand Down
Loading