From 4ee69ddd6dede6761285bd99c6b4a789664ed4d0 Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Thu, 26 Oct 2023 11:26:25 +0100 Subject: [PATCH] Add patch to avoid another test failure on s390x --- ...-test-admin-deploy-uboot.sh-on-s390x.patch | 29 +++++++++++++++++++ debian/patches/series | 1 + 2 files changed, 30 insertions(+) create mode 100644 debian/patches/debian/Skip-test-admin-deploy-uboot.sh-on-s390x.patch diff --git a/debian/patches/debian/Skip-test-admin-deploy-uboot.sh-on-s390x.patch b/debian/patches/debian/Skip-test-admin-deploy-uboot.sh-on-s390x.patch new file mode 100644 index 00000000..f79722f1 --- /dev/null +++ b/debian/patches/debian/Skip-test-admin-deploy-uboot.sh-on-s390x.patch @@ -0,0 +1,29 @@ +From: Simon McVittie +Date: Thu, 26 Oct 2023 11:26:04 +0100 +Subject: Skip test-admin-deploy-uboot.sh on s390x + +It fails on a porterbox. ostree hard-codes zipl to be used on s390x, +so it's reasonable that tests for other bootloaders might not work. + +Bug: https://github.com/ostreedev/ostree/issues/3086 +Forwarded: no +--- + tests/test-admin-deploy-uboot.sh | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/tests/test-admin-deploy-uboot.sh b/tests/test-admin-deploy-uboot.sh +index 9a4d773..2f1809f 100755 +--- a/tests/test-admin-deploy-uboot.sh ++++ b/tests/test-admin-deploy-uboot.sh +@@ -20,6 +20,11 @@ + + set -euo pipefail + ++if [ "${DEB_HOST_ARCH-}" = s390x ]; then ++ echo "1..0 # SKIP uBoot not supported on s390x" ++ exit 0 ++fi ++ + . $(dirname $0)/libtest.sh + + # Exports OSTREE_SYSROOT so --sysroot not needed. diff --git a/debian/patches/series b/debian/patches/series index 89e6d8fd..f5038c4c 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1,4 @@ bootloader-zipl-No-op-if-run-as-non-root.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 -- 2.30.2