From eed52ec59d2f428b91e38a3f67caf06bd968bbfd Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Wed, 24 Jan 2024 14:50:04 +0000 Subject: [PATCH] Re-enable composefs, this time with a proposed patch to avoid test failures We can't run its unit tests on a Debian 12 kernel with /var/tmp on tmpfs, but they do pass on a sid kernel or if /var/tmp is disk-backed. --- debian/patches/series | 1 + ...test-if-var-tmp-does-not-support-use.patch | 26 +++++++++++++++++++ debian/rules | 2 +- 3 files changed, 28 insertions(+), 1 deletion(-) create mode 100644 debian/patches/tests-Skip-composefs-test-if-var-tmp-does-not-support-use.patch diff --git a/debian/patches/series b/debian/patches/series index 78a4e054..60f6179e 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1,4 @@ +tests-Skip-composefs-test-if-var-tmp-does-not-support-use.patch debian/Skip-test-pull-repeated-during-CI.patch debian/test-sysroot-Skip-on-s390x-by-default.patch debian/Skip-test-admin-deploy-uboot.sh-on-s390x.patch diff --git a/debian/patches/tests-Skip-composefs-test-if-var-tmp-does-not-support-use.patch b/debian/patches/tests-Skip-composefs-test-if-var-tmp-does-not-support-use.patch new file mode 100644 index 00000000..dbda0d17 --- /dev/null +++ b/debian/patches/tests-Skip-composefs-test-if-var-tmp-does-not-support-use.patch @@ -0,0 +1,26 @@ +From: Simon McVittie +Date: Wed, 24 Jan 2024 13:55:12 +0000 +Subject: tests: Skip composefs test if /var/tmp does not support user xattrs + +Otherwise, this test fails on Debian 12 (Linux 6.1) kernels if /var/tmp +is a tmpfs. Some autobuilders put the entire build chroot on a tmpfs, +to speed up builds. + +Signed-off-by: Simon McVittie +Forwarded: https://github.com/ostreedev/ostree/pull/3145 +--- + tests/test-composefs.sh | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/tests/test-composefs.sh b/tests/test-composefs.sh +index 4b91973..d05579f 100755 +--- a/tests/test-composefs.sh ++++ b/tests/test-composefs.sh +@@ -24,6 +24,7 @@ if ! ${CMD_PREFIX} ostree --version | grep -q -e '- composefs'; then + exit 0 + fi + ++skip_without_user_xattrs + + setup_test_repository "bare-user" + diff --git a/debian/rules b/debian/rules index 6095fef4..e465d720 100755 --- a/debian/rules +++ b/debian/rules @@ -17,6 +17,7 @@ endif configure_options = \ --enable-installed-tests \ --with-avahi \ + --with-composefs \ --with-curl \ --with-dracut \ --with-grub2 \ @@ -29,7 +30,6 @@ configure_options = \ --with-selinux \ --with-systemdsystemgeneratordir=/usr/lib/systemd/system-generators \ --with-systemdsystemunitdir=/usr/lib/systemd/system \ - --without-composefs \ --without-smack \ $(NULL) -- 2.30.2