From 265aa7f52c4ab908472ea9dc4568b28e63671b23 Mon Sep 17 00:00:00 2001 From: Roger Pau Monne Date: Tue, 21 Nov 2023 17:03:56 +0100 Subject: [PATCH] automation: update tests to use Debian Bookworm MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit 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é Reviewed-by: Stefano Stabellini master commit: b78b4de1c51b741d48817aae562d9e040b072b83 master date: 2023-11-21 17:03:56 +0100 --- automation/build/debian/bookworm.dockerfile | 5 +++++ automation/gitlab-ci/test.yaml | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/automation/build/debian/bookworm.dockerfile b/automation/build/debian/bookworm.dockerfile index 9f0c180b74..2b1aa7b909 100644 --- 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 f1fd26d650..59698e9044 100644 --- 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: -- 2.39.5