automation: update x86-64 QEMU based tests to use Debian Bookworm

The current tests use Debian Stretch, which is obsolete.

Signed-off-by: Roger Pau Monné <roger.pau@citrix.com>
---
The Bookworm container needs to be updated to contain the required tools before
pushing this change.

diff --git a/automation/build/debian/bookworm.dockerfile b/automation/build/debian/bookworm.dockerfile
index ac87778b3972e44287d0bb2bf19f51afff1580cf..459f8e30bdc6ea63a90d4825978a1ac1d8b7d803 100644 (file)
--- a/automation/build/debian/bookworm.dockerfile
+++ b/automation/build/debian/bookworm.dockerfile
@@ -46,6 +46,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/build/debian/stretch.dockerfile b/automation/build/debian/stretch.dockerfile
index 9f6c146f032c24a1f0f89d7ef4cbf1bd92095d6b..c1a28171c17d9edf211cffb4f5f47e5479f585ad 100644 (file)
--- a/automation/build/debian/stretch.dockerfile
+++ b/automation/build/debian/stretch.dockerfile
@@ -45,11 +45,6 @@ RUN apt-get update && \
         nasm \
         gnupg \
         apt-transport-https \
-        # 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 61e642cce0cc8795275f42f3a7a8053e53abc341..5861cb6b323668a67a4c66c37e5aac37676c57db 100644 (file)
--- a/automation/gitlab-ci/test.yaml
+++ b/automation/gitlab-ci/test.yaml
@@ -43,7 +43,7 @@
 .qemu-x86-64:
   extends: .test-jobs-common
   variables:
-    CONTAINER: debian:stretch
+    CONTAINER: debian:bookworm
     LOGFILE: qemu-smoke-x86-64.log
   artifacts:
     paths: