automation: update tests to use Debian Bookworm

Switch tests using Stretch to Bookworm, as Stretch is EOL.

Note the packages are not removed from the Stretch dockerfile, because the
tests in stable branches will run using the old containers.

[backport: leave the XTF jobs on x86 unchanged as they don't seem to
work with the newer containers]

Signed-off-by: Roger Pau Monné <roger.pau@citrix.com>
Reviewed-by: Stefano Stabellini <sstabellini@kernel.org>
master commit: b78b4de1c51b741d48817aae562d9e040b072b83
master date: 2023-11-21 17:03:56 +0100

diff --git a/automation/build/debian/bookworm.dockerfile b/automation/build/debian/bookworm.dockerfile
index 9f0c180b74aad7369a82c2d30908d86e3d85e9f5..2b1aa7b9096a95a11aca97c4a22c5e857ab47bc9 100644 (file)
--- a/automation/build/debian/bookworm.dockerfile
+++ b/automation/build/debian/bookworm.dockerfile
@@ -47,6 +47,11 @@ RUN apt-get update && \
         gnupg \
         apt-transport-https \
         golang \
+        # for test phase, qemu-smoke-* jobs
+        qemu-system-x86 \
+        # for test phase, qemu-alpine-* jobs
+        cpio \
+        busybox-static \
         && \
         apt-get autoremove -y && \
         apt-get clean && \

diff --git a/automation/gitlab-ci/test.yaml b/automation/gitlab-ci/test.yaml
index f1fd26d65086026ec4d0b029e87c8664c422bac0..59698e90440ef1e8f5542c0fbe61b38b29b16cd8 100644 (file)
--- a/automation/gitlab-ci/test.yaml
+++ b/automation/gitlab-ci/test.yaml
@@ -47,7 +47,7 @@ qemu-alpine-arm64-gcc:
 qemu-alpine-x86_64-gcc:
   extends: .test-jobs-common
   variables:
-    CONTAINER: debian:stretch
+    CONTAINER: debian:bookworm
   script:
     - ./automation/scripts/qemu-alpine-x86_64.sh 2>&1 | tee qemu-smoke-x86_64.log
   needs: