tests/docker: upgrade most non-lcitool debian tests to debian 13
Debian 11 was EOL in 2024, and Debian 12 will be EOL this June. This patch moves all but one of our tests, debian-legacy-test-cross, onto Debian 13. This patch does the bare minimum to upgrade these tests and doesn't make any attempt at optimization or cleanup that may or may not be possible with this upgrade. Signed-off-by: John Snow <jsnow@redhat.com> Reviewed-by: Daniel P. Berrangé <berrange@redhat.com> [AJB: tweak summary line] Message-ID: <20260226185303.1920021-2-alex.bennee@linaro.org> Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
John Snow committed
Feb 26, 2026 at 18:52 UTC
e2d4646a02689c8428f267e66ab422f04aa717ba
5 files changed
+19
-17
tests/docker/dockerfiles/debian-hexagon-cross.docker
+6
-5
@@ -5,10 +5,12 @@
5
# needs to be able to build QEMU itself in CI we include its
6
# build-deps.
7
#
8
-FROM docker.io/library/debian:11-slim
8
+FROM docker.io/library/debian:13-slim
9
+
10
+# Add deb-src repository sources
11
+RUN sed -i "s/^Types: deb$/Types: deb deb-src/" \
12
+ /etc/apt/sources.list.d/debian.sources
13
10
-# Duplicate deb line as deb-src
11
-RUN cat /etc/apt/sources.list | sed "s/^deb\ /deb-src /" >> /etc/apt/sources.list
14
RUN apt-get update && \
15
DEBIAN_FRONTEND=noninteractive apt install -yy eatmydata && \
16
DEBIAN_FRONTEND=noninteractive eatmydata \
@@ -24,6 +26,7 @@ RUN apt-get update && \
26
ninja-build \
27
python3-pip \
28
python3-setuptools \
29
+ python3-tomli \
30
python3-venv \
31
python3-wheel && \
32
# Install QEMU build deps for use in CI
@@ -36,8 +39,6 @@ RUN apt-get update && \
39
ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/gcc && \
40
dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --show > /packages.txt
41
39
-RUN /usr/bin/pip3 install tomli
40
-
42
ENV TOOLCHAIN_INSTALL /opt
43
ENV TOOLCHAIN_RELEASE 12.Dec.2023
44
ENV TOOLCHAIN_BASENAME "clang+llvm-${TOOLCHAIN_RELEASE}-cross-hexagon-unknown-linux-musl"
tests/docker/dockerfiles/debian-loongarch-cross.docker
+5
-5
@@ -4,10 +4,11 @@
4
# This docker target uses prebuilt toolchains for LoongArch64 from:
5
# https://github.com/loongson/build-tools/releases
6
#
7
-FROM docker.io/library/debian:11-slim
7
+FROM docker.io/library/debian:13-slim
8
9
-# Duplicate deb line as deb-src
10
-RUN cat /etc/apt/sources.list | sed "s/^deb\ /deb-src /" >> /etc/apt/sources.list
9
+# Add deb-src repository sources
10
+RUN sed -i "s/^Types: deb$/Types: deb deb-src/" \
11
+ /etc/apt/sources.list.d/debian.sources
12
13
RUN export DEBIAN_FRONTEND=noninteractive && \
14
apt-get update && \
@@ -31,12 +32,11 @@ RUN apt-get update && \
32
ninja-build \
33
python3-pip \
34
python3-setuptools \
35
+ python3-tomli \
36
python3-venv \
37
python3-wheel && \
38
dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --show > /packages.txt
39
38
-RUN /usr/bin/pip3 install tomli
39
-
40
RUN curl -#SL https://github.com/loongson/build-tools/releases/download/2023.08.08/CLFS-loongarch64-8.1-x86_64-cross-tools-gcc-glibc.tar.xz \
41
| tar -xJC /opt
42
tests/docker/dockerfiles/debian-toolchain.docker
+5
-3
@@ -4,13 +4,15 @@
4
# This dockerfile is used for building a cross-compiler toolchain.
5
# The script for building the toolchain is supplied via extra-files.
6
#
7
-FROM docker.io/library/debian:11-slim
7
+FROM docker.io/library/debian:13-slim
8
9
# Install build utilities for building gcc and glibc.
10
# ??? The build-dep isn't working, missing a number of
11
# minimal build dependiencies, e.g. libmpc.
12
13
-RUN sed 's/^deb /deb-src /' </etc/apt/sources.list >/etc/apt/sources.list.d/deb-src.list
13
+# Add deb-src repository sources
14
+RUN sed -i "s/^Types: deb$/Types: deb deb-src/" \
15
+ /etc/apt/sources.list.d/debian.sources
16
17
RUN apt update && \
18
DEBIAN_FRONTEND=noninteractive apt install -yy eatmydata && \
@@ -34,7 +36,7 @@ RUN cd /root && ./build-toolchain.sh
36
# Throw away the extra toolchain build deps, the downloaded source,
37
# and the build trees by restoring the original image,
38
# then copying the built toolchain from stage 0.
37
-FROM docker.io/library/debian:11-slim
39
+FROM docker.io/library/debian:13-slim
40
RUN apt update && \
41
DEBIAN_FRONTEND=noninteractive apt install -yy eatmydata && \
42
DEBIAN_FRONTEND=noninteractive eatmydata \
tests/docker/dockerfiles/debian-tricore-cross.docker
+2
-3
@@ -9,7 +9,7 @@
9
#
10
# SPDX-License-Identifier: GPL-2.0-or-later
11
#
12
-FROM docker.io/library/debian:11-slim
12
+FROM docker.io/library/debian:13-slim
13
14
RUN apt update && \
15
DEBIAN_FRONTEND=noninteractive apt install -yy eatmydata && \
@@ -31,12 +31,11 @@ RUN apt update && \
31
pkgconf \
32
python3-pip \
33
python3-setuptools \
34
+ python3-tomli \
35
python3-wheel \
36
python3-venv && \
37
dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --show > /packages.txt
38
38
-RUN /usr/bin/pip3 install tomli
39
-
39
RUN curl -#SL https://github.com/bkoppelmann/package_940/releases/download/tricore-toolchain-9.40/tricore-toolchain-9.4.0.tar.gz \
40
| tar -xzC /usr/local/
41
tests/docker/dockerfiles/debian-xtensa-cross.docker
+1
-1
@@ -5,7 +5,7 @@
5
# using a prebuilt toolchains for Xtensa cores from:
6
# https://github.com/foss-xtensa/toolchain/releases
7
#
8
-FROM docker.io/library/debian:11-slim
8
+FROM docker.io/library/debian:13-slim
9
10
RUN apt-get update && \
11
DEBIAN_FRONTEND=noninteractive apt install -yy eatmydata && \