Add patch to avoid another test failure on s390x

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 (file)
index 0000000..f79722f
--- /dev/null
+++ b/debian/patches/debian/Skip-test-admin-deploy-uboot.sh-on-s390x.patch
@@ -0,0 +1,29 @@
+From: Simon McVittie <smcv@debian.org>
+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 89e6d8fd509cdfe3eec034010e30c58985c706ef..f5038c4cf626859f2d3c94534393e75fc6ed3397 100644 (file)
--- 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