diff options
| author | Helmut Grohne <helmut@subdivi.de> | 2023-01-25 09:30:41 +0100 |
|---|---|---|
| committer | Helmut Grohne <helmut@subdivi.de> | 2023-01-25 09:30:41 +0100 |
| commit | 88b229430a91354510224c960d30f427e078e8a8 (patch) | |
| tree | 24703357684ad8d706cc8432c78c8c16841a949b | |
| parent | c405204a84eef99591cfe0ea41a873d508557b26 (diff) | |
| download | debvm-88b229430a91354510224c960d30f427e078e8a8.tar.gz | |
tests: use an amd64 kernel on i386
| -rw-r--r-- | .gitlab-ci.yml | 2 | ||||
| -rwxr-xr-x | tests/create-and-run.sh | 8 |
2 files changed, 7 insertions, 3 deletions
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 |