Browse Source

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>
master
John Snow 1 month ago
committed by Alex Bennée
parent
commit
e2d4646a02
  1. 11
      tests/docker/dockerfiles/debian-hexagon-cross.docker
  2. 10
      tests/docker/dockerfiles/debian-loongarch-cross.docker
  3. 8
      tests/docker/dockerfiles/debian-toolchain.docker
  4. 5
      tests/docker/dockerfiles/debian-tricore-cross.docker
  5. 2
      tests/docker/dockerfiles/debian-xtensa-cross.docker

11
tests/docker/dockerfiles/debian-hexagon-cross.docker

@ -5,10 +5,12 @@
# needs to be able to build QEMU itself in CI we include its # needs to be able to build QEMU itself in CI we include its
# build-deps. # build-deps.
# #
FROM docker.io/library/debian:11-slim FROM docker.io/library/debian:13-slim
# Add deb-src repository sources
RUN sed -i "s/^Types: deb$/Types: deb deb-src/" \
/etc/apt/sources.list.d/debian.sources
# Duplicate deb line as deb-src
RUN cat /etc/apt/sources.list | sed "s/^deb\ /deb-src /" >> /etc/apt/sources.list
RUN apt-get update && \ RUN apt-get update && \
DEBIAN_FRONTEND=noninteractive apt install -yy eatmydata && \ DEBIAN_FRONTEND=noninteractive apt install -yy eatmydata && \
DEBIAN_FRONTEND=noninteractive eatmydata \ DEBIAN_FRONTEND=noninteractive eatmydata \
@ -24,6 +26,7 @@ RUN apt-get update && \
ninja-build \ ninja-build \
python3-pip \ python3-pip \
python3-setuptools \ python3-setuptools \
python3-tomli \
python3-venv \ python3-venv \
python3-wheel && \ python3-wheel && \
# Install QEMU build deps for use in CI # Install QEMU build deps for use in CI
@ -36,8 +39,6 @@ RUN apt-get update && \
ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/gcc && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/gcc && \
dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --show > /packages.txt dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --show > /packages.txt
RUN /usr/bin/pip3 install tomli
ENV TOOLCHAIN_INSTALL /opt ENV TOOLCHAIN_INSTALL /opt
ENV TOOLCHAIN_RELEASE 12.Dec.2023 ENV TOOLCHAIN_RELEASE 12.Dec.2023
ENV TOOLCHAIN_BASENAME "clang+llvm-${TOOLCHAIN_RELEASE}-cross-hexagon-unknown-linux-musl" ENV TOOLCHAIN_BASENAME "clang+llvm-${TOOLCHAIN_RELEASE}-cross-hexagon-unknown-linux-musl"

10
tests/docker/dockerfiles/debian-loongarch-cross.docker

@ -4,10 +4,11 @@
# This docker target uses prebuilt toolchains for LoongArch64 from: # This docker target uses prebuilt toolchains for LoongArch64 from:
# https://github.com/loongson/build-tools/releases # https://github.com/loongson/build-tools/releases
# #
FROM docker.io/library/debian:11-slim FROM docker.io/library/debian:13-slim
# Duplicate deb line as deb-src # Add deb-src repository sources
RUN cat /etc/apt/sources.list | sed "s/^deb\ /deb-src /" >> /etc/apt/sources.list RUN sed -i "s/^Types: deb$/Types: deb deb-src/" \
/etc/apt/sources.list.d/debian.sources
RUN export DEBIAN_FRONTEND=noninteractive && \ RUN export DEBIAN_FRONTEND=noninteractive && \
apt-get update && \ apt-get update && \
@ -31,12 +32,11 @@ RUN apt-get update && \
ninja-build \ ninja-build \
python3-pip \ python3-pip \
python3-setuptools \ python3-setuptools \
python3-tomli \
python3-venv \ python3-venv \
python3-wheel && \ python3-wheel && \
dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --show > /packages.txt dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --show > /packages.txt
RUN /usr/bin/pip3 install tomli
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 \ 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 \
| tar -xJC /opt | tar -xJC /opt

8
tests/docker/dockerfiles/debian-toolchain.docker

@ -4,13 +4,15 @@
# This dockerfile is used for building a cross-compiler toolchain. # This dockerfile is used for building a cross-compiler toolchain.
# The script for building the toolchain is supplied via extra-files. # The script for building the toolchain is supplied via extra-files.
# #
FROM docker.io/library/debian:11-slim FROM docker.io/library/debian:13-slim
# Install build utilities for building gcc and glibc. # Install build utilities for building gcc and glibc.
# ??? The build-dep isn't working, missing a number of # ??? The build-dep isn't working, missing a number of
# minimal build dependiencies, e.g. libmpc. # minimal build dependiencies, e.g. libmpc.
RUN sed 's/^deb /deb-src /' </etc/apt/sources.list >/etc/apt/sources.list.d/deb-src.list # Add deb-src repository sources
RUN sed -i "s/^Types: deb$/Types: deb deb-src/" \
/etc/apt/sources.list.d/debian.sources
RUN apt update && \ RUN apt update && \
DEBIAN_FRONTEND=noninteractive apt install -yy eatmydata && \ DEBIAN_FRONTEND=noninteractive apt install -yy eatmydata && \
@ -34,7 +36,7 @@ RUN cd /root && ./build-toolchain.sh
# Throw away the extra toolchain build deps, the downloaded source, # Throw away the extra toolchain build deps, the downloaded source,
# and the build trees by restoring the original image, # and the build trees by restoring the original image,
# then copying the built toolchain from stage 0. # then copying the built toolchain from stage 0.
FROM docker.io/library/debian:11-slim FROM docker.io/library/debian:13-slim
RUN apt update && \ RUN apt update && \
DEBIAN_FRONTEND=noninteractive apt install -yy eatmydata && \ DEBIAN_FRONTEND=noninteractive apt install -yy eatmydata && \
DEBIAN_FRONTEND=noninteractive eatmydata \ DEBIAN_FRONTEND=noninteractive eatmydata \

5
tests/docker/dockerfiles/debian-tricore-cross.docker

@ -9,7 +9,7 @@
# #
# SPDX-License-Identifier: GPL-2.0-or-later # SPDX-License-Identifier: GPL-2.0-or-later
# #
FROM docker.io/library/debian:11-slim FROM docker.io/library/debian:13-slim
RUN apt update && \ RUN apt update && \
DEBIAN_FRONTEND=noninteractive apt install -yy eatmydata && \ DEBIAN_FRONTEND=noninteractive apt install -yy eatmydata && \
@ -31,12 +31,11 @@ RUN apt update && \
pkgconf \ pkgconf \
python3-pip \ python3-pip \
python3-setuptools \ python3-setuptools \
python3-tomli \
python3-wheel \ python3-wheel \
python3-venv && \ python3-venv && \
dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --show > /packages.txt dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --show > /packages.txt
RUN /usr/bin/pip3 install tomli
RUN curl -#SL https://github.com/bkoppelmann/package_940/releases/download/tricore-toolchain-9.40/tricore-toolchain-9.4.0.tar.gz \ RUN curl -#SL https://github.com/bkoppelmann/package_940/releases/download/tricore-toolchain-9.40/tricore-toolchain-9.4.0.tar.gz \
| tar -xzC /usr/local/ | tar -xzC /usr/local/

2
tests/docker/dockerfiles/debian-xtensa-cross.docker

@ -5,7 +5,7 @@
# using a prebuilt toolchains for Xtensa cores from: # using a prebuilt toolchains for Xtensa cores from:
# https://github.com/foss-xtensa/toolchain/releases # https://github.com/foss-xtensa/toolchain/releases
# #
FROM docker.io/library/debian:11-slim FROM docker.io/library/debian:13-slim
RUN apt-get update && \ RUN apt-get update && \
DEBIAN_FRONTEND=noninteractive apt install -yy eatmydata && \ DEBIAN_FRONTEND=noninteractive apt install -yy eatmydata && \

Loading…
Cancel
Save