From 999970b6e3e3ca3e19d9a9ef7dfd1443f9ced59e Mon Sep 17 00:00:00 2001
From: Helmut Grohne <helmut@subdivi.de>
Date: Tue, 24 Jan 2023 14:45:21 +0100
Subject: tests: add armel with an armhf kernel

---
 tests/create-and-run.sh | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'tests')

diff --git a/tests/create-and-run.sh b/tests/create-and-run.sh
index 58c4822..819161f 100755
--- a/tests/create-and-run.sh
+++ b/tests/create-and-run.sh
@@ -20,7 +20,10 @@ cleanup() {
 trap cleanup EXIT INT TERM QUIT
 
 ssh-keygen -f "$SSH_KEYPATH" -N ''
-debvm-create -k "$SSH_KEYPATH.pub" -o "$IMAGE" -a "$ARCHITECTURE" -r "$RELEASE"
+set --
+# Use an armhf kernel for armel.
+test "$ARCHITECTURE" = armel && set -- -- --architecture armhf
+debvm-create -k "$SSH_KEYPATH.pub" -o "$IMAGE" -a "$ARCHITECTURE" -r "$RELEASE" "$@"
 
 SSH_PORT=2222
 timeout 300s debvm-run -s "$SSH_PORT" -i "$IMAGE" &
-- 
cgit v1.2.3


From 88b229430a91354510224c960d30f427e078e8a8 Mon Sep 17 00:00:00 2001
From: Helmut Grohne <helmut@subdivi.de>
Date: Wed, 25 Jan 2023 09:30:41 +0100
Subject: tests: use an amd64 kernel on i386

---
 .gitlab-ci.yml          | 2 +-
 tests/create-and-run.sh | 8 ++++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

(limited to 'tests')

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e97f0bd..baea94c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -46,5 +46,5 @@ arch_test:
     - test -e /proc/sys/fs/binfmt_misc/status || mount -t binfmt_misc binfmt_misc /proc/sys/fs/binfmt_misc
     - apt-get update
     - apt-get dist-upgrade --yes
-    - apt-get --no-install-recommends --yes install e2fsprogs genext2fs mmdebstrap openssh-client qemu-system binfmt-support arch-test qemu-user-static
+    - apt-get --no-install-recommends --yes install e2fsprogs genext2fs mmdebstrap openssh-client qemu-system binfmt-support arch-test qemu-user-static file
     - PATH=$(pwd)/bin:$PATH ./tests/create-and-run.sh "$ARCHITECTURE" sid
diff --git a/tests/create-and-run.sh b/tests/create-and-run.sh
index 819161f..c8efa3e 100755
--- a/tests/create-and-run.sh
+++ b/tests/create-and-run.sh
@@ -21,8 +21,12 @@ trap cleanup EXIT INT TERM QUIT
 
 ssh-keygen -f "$SSH_KEYPATH" -N ''
 set --
-# Use an armhf kernel for armel.
-test "$ARCHITECTURE" = armel && set -- -- --architecture armhf
+case "$ARCHITECTURE" in
+	# Booting an armel kernel on qemu is next to impossible.
+	armel) set -- -- --architecture armhf ;;
+	# Broken kernel #1029270.
+	i386) set -- -- --architecture amd64 ;;
+esac
 debvm-create -k "$SSH_KEYPATH.pub" -o "$IMAGE" -a "$ARCHITECTURE" -r "$RELEASE" "$@"
 
 SSH_PORT=2222
-- 
cgit v1.2.3