diff options
author | Helmut Grohne <helmut@subdivi.de> | 2023-01-24 14:45:21 +0100 |
---|---|---|
committer | Helmut Grohne <helmut@subdivi.de> | 2023-01-24 14:45:21 +0100 |
commit | 999970b6e3e3ca3e19d9a9ef7dfd1443f9ced59e (patch) | |
tree | deaba57520a7f665f6eac4fd9e12eee5cd9f6bba | |
parent | bc5cf471af5b53ef955eb4c828642bfe591b449a (diff) | |
download | debvm-999970b6e3e3ca3e19d9a9ef7dfd1443f9ced59e.tar.gz |
tests: add armel with an armhf kernel
-rw-r--r-- | .gitlab-ci.yml | 1 | ||||
-rwxr-xr-x | tests/create-and-run.sh | 5 |
2 files changed, 5 insertions, 1 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 4604045..e97f0bd 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -35,6 +35,7 @@ arch_test: matrix: - ARCHITECTURE: - arm64 + - armel - armhf - i386 - mips64el 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" & |