[PATCH v2 0/3] tests: upgrade containers to debian 13

[PATCH v2 0/3] tests: upgrade containers to debian 13

[John Snow]

This mini-series upgrades everything except mipsel tests to Debian 13,
removing our usage of the EOL Debian 11. Our mipsel tests continue to
run Debian 12, which will be EOL in June.

This is mostly helpful to me for being able to increase the minimum
version of Python modules like setuptools, pip and wheel as I ran into
while writing
https://patchew.org/QEMU/20260216212952.420120-1-jsnow@redhat.com/

v2:
 - Rebased on origin/master following the merge of the qemu.qmp series

Note: there is a minor conflict with
https://patchew.org/QEMU/20260225192808.957477-1-jsnow@redhat.com/
concerning the pinned wheel version in python/tests/minreqs.txt - the
change in this series should take precedence.

John Snow (3):
  tests: upgrade most non-lcitool debian tests to debian 13
  tests: upgrade debian-legacy-test-cross to debian 13
  python: upgrade minimum setuptools/wheel/pip versions

 python/tests/minreqs.txt                       |  1 +
 pythondeps.toml                                | 18 ++++++++++--------
 .../dockerfiles/debian-hexagon-cross.docker    | 11 ++++++-----
 .../debian-legacy-test-cross.docker            | 16 +++++-----------
 .../dockerfiles/debian-loongarch-cross.docker  | 10 +++++-----
 .../docker/dockerfiles/debian-toolchain.docker |  8 +++++---
 .../dockerfiles/debian-tricore-cross.docker    |  5 ++---
 .../dockerfiles/debian-xtensa-cross.docker     |  2 +-
 8 files changed, 35 insertions(+), 36 deletions(-)

-- 
2.53.0

[PATCH v2 1/3] tests: upgrade most non-lcitool debian tests to debian 13

[John Snow]

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>
---
 tests/docker/dockerfiles/debian-hexagon-cross.docker  | 11 ++++++-----
 .../docker/dockerfiles/debian-loongarch-cross.docker  | 10 +++++-----
 tests/docker/dockerfiles/debian-toolchain.docker      |  8 +++++---
 tests/docker/dockerfiles/debian-tricore-cross.docker  |  5 ++---
 tests/docker/dockerfiles/debian-xtensa-cross.docker   |  2 +-
 5 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/tests/docker/dockerfiles/debian-hexagon-cross.docker b/tests/docker/dockerfiles/debian-hexagon-cross.docker
index 23152b4918b..91d4b71ac95 100644
--- a/tests/docker/dockerfiles/debian-hexagon-cross.docker
+++ b/tests/docker/dockerfiles/debian-hexagon-cross.docker
@@ -5,10 +5,12 @@
 # needs to be able to build QEMU itself in CI we include its
 # 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 && \
     DEBIAN_FRONTEND=noninteractive apt install -yy eatmydata && \
     DEBIAN_FRONTEND=noninteractive eatmydata \
@@ -24,6 +26,7 @@ RUN apt-get update && \
         ninja-build \
         python3-pip \
         python3-setuptools \
+        python3-tomli \
         python3-venv \
         python3-wheel && \
 # 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 && \
     dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --show > /packages.txt
 
-RUN /usr/bin/pip3 install tomli
-
 ENV TOOLCHAIN_INSTALL /opt
 ENV TOOLCHAIN_RELEASE 12.Dec.2023
 ENV TOOLCHAIN_BASENAME "clang+llvm-${TOOLCHAIN_RELEASE}-cross-hexagon-unknown-linux-musl"
diff --git a/tests/docker/dockerfiles/debian-loongarch-cross.docker b/tests/docker/dockerfiles/debian-loongarch-cross.docker
index 538ab534902..55b3dbe4510 100644
--- a/tests/docker/dockerfiles/debian-loongarch-cross.docker
+++ b/tests/docker/dockerfiles/debian-loongarch-cross.docker
@@ -4,10 +4,11 @@
 # This docker target uses prebuilt toolchains for LoongArch64 from:
 # 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
-RUN cat /etc/apt/sources.list | sed "s/^deb\ /deb-src /" >> /etc/apt/sources.list
+# Add deb-src repository sources
+RUN sed -i "s/^Types: deb$/Types: deb deb-src/" \
+    /etc/apt/sources.list.d/debian.sources
 
 RUN export DEBIAN_FRONTEND=noninteractive && \
     apt-get update && \
@@ -31,12 +32,11 @@ RUN apt-get update && \
         ninja-build \
         python3-pip \
         python3-setuptools \
+        python3-tomli \
         python3-venv \
         python3-wheel && \
         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 \
     | tar -xJC /opt
 
diff --git a/tests/docker/dockerfiles/debian-toolchain.docker b/tests/docker/dockerfiles/debian-toolchain.docker
index ab4ce29533d..9a256209a78 100644
--- a/tests/docker/dockerfiles/debian-toolchain.docker
+++ b/tests/docker/dockerfiles/debian-toolchain.docker
@@ -4,13 +4,15 @@
 # This dockerfile is used for building a cross-compiler toolchain.
 # 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.
 # ??? The build-dep isn't working, missing a number of
 # 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 && \
     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,
 # and the build trees by restoring the original image,
 # 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 && \
     DEBIAN_FRONTEND=noninteractive apt install -yy eatmydata && \
     DEBIAN_FRONTEND=noninteractive eatmydata \
diff --git a/tests/docker/dockerfiles/debian-tricore-cross.docker b/tests/docker/dockerfiles/debian-tricore-cross.docker
index 7e00e870ceb..fd797dc7ee4 100644
--- a/tests/docker/dockerfiles/debian-tricore-cross.docker
+++ b/tests/docker/dockerfiles/debian-tricore-cross.docker
@@ -9,7 +9,7 @@
 #
 # 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 && \
     DEBIAN_FRONTEND=noninteractive apt install -yy eatmydata && \
@@ -31,12 +31,11 @@ RUN apt update && \
        pkgconf \
        python3-pip \
        python3-setuptools \
+       python3-tomli \
        python3-wheel \
        python3-venv && \
        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 \
     | tar -xzC /usr/local/
 
diff --git a/tests/docker/dockerfiles/debian-xtensa-cross.docker b/tests/docker/dockerfiles/debian-xtensa-cross.docker
index d011eee2ad3..ef63e44e2ef 100644
--- a/tests/docker/dockerfiles/debian-xtensa-cross.docker
+++ b/tests/docker/dockerfiles/debian-xtensa-cross.docker
@@ -5,7 +5,7 @@
 # using a prebuilt toolchains for Xtensa cores from:
 # 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 && \
     DEBIAN_FRONTEND=noninteractive apt install -yy eatmydata && \
-- 
2.53.0

[PATCH v2 2/3] tests: upgrade debian-legacy-test-cross to debian 13

[John Snow]

We no longer require Debian 11 to run these tests; they work properly
under Debian 13/Trixie.

Signed-off-by: John Snow <jsnow@redhat.com>
---
 .../dockerfiles/debian-legacy-test-cross.docker  | 16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)

diff --git a/tests/docker/dockerfiles/debian-legacy-test-cross.docker b/tests/docker/dockerfiles/debian-legacy-test-cross.docker
index 5a6616b7d39..293f31a07d6 100644
--- a/tests/docker/dockerfiles/debian-legacy-test-cross.docker
+++ b/tests/docker/dockerfiles/debian-legacy-test-cross.docker
@@ -1,18 +1,13 @@
 # Docker legacy cross-compiler target (tests and minimal qemu)
 #
-# Compilers for some of our older targets which we cant currently
-# upgrade. Currently:
-#
-#   libc6.1-dev-alpha-cross: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1054412
-#   sh4-linux-user: binaries don't run with bookworm compiler
-#
 # As we are targeting check-tcg here we only need minimal qemu
 # dependencies and the relevant cross compilers.
 
-FROM docker.io/library/debian:11-slim
+FROM docker.io/library/debian:13-slim
 
-# Duplicate deb line as deb-src
-RUN cat /etc/apt/sources.list | sed "s/^deb\ /deb-src /" >> /etc/apt/sources.list
+# Add deb-src repository sources
+RUN sed -i "s/^Types: deb$/Types: deb deb-src/" \
+    /etc/apt/sources.list.d/debian.sources
 
 RUN export DEBIAN_FRONTEND=noninteractive && \
     apt-get update && \
@@ -35,12 +30,11 @@ RUN DEBIAN_FRONTEND=noninteractive eatmydata \
         libc6-dev-sh4-cross \
         python3-pip \
         python3-setuptools \
+        python3-tomli \
         python3-venv \
         python3-wheel && \
         dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --show > /packages.txt
 
-RUN /usr/bin/pip3 install tomli
-
 ENV QEMU_CONFIGURE_OPTS --disable-system --disable-docs --disable-tools
 ENV DEF_TARGET_LIST alpha-linux-user,sh4-linux-user
 ENV MAKE /usr/bin/make
-- 
2.53.0

[PATCH v2 3/3] python: upgrade minimum setuptools/wheel/pip versions

[John Snow]

With Debian 11 tests removed from our CI suite, we are allowed to rely
on the versions present in CentOS Stream 9 as a new minimum.

Note that CentOS Stream 9 does offer Python 3.12 packages, but mandating
this incurs the loss of ability to build offline documentation on CentOS
because there is no official Sphinx package for Python 3.12. We will
very likely mandate these upgraded packages for QEMU 11.1, but there is
no real benefit to doing it now for 11.0 - It will be simpler to perform
that upgrade after QEMU drops support for Ubuntu 22.04 LTS in late
April.

See
https://gitlab.com/jsnow/repology-dashboard#results-overview-as-of-2026-02-16
for more details on current Python ecosystem versions across all of our
supported build platforms.

Signed-off-by: John Snow <jsnow@redhat.com>
---
 python/tests/minreqs.txt |  1 +
 pythondeps.toml          | 18 ++++++++++--------
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/python/tests/minreqs.txt b/python/tests/minreqs.txt
index 855b5129c94..6fc671b1780 100644
--- a/python/tests/minreqs.txt
+++ b/python/tests/minreqs.txt
@@ -16,6 +16,7 @@
 # installation of the QEMU package itself fails, failing to find
 # setuptools.
 setuptools<=70
+wheel==0.36.2
 
 # Dependencies for qapidoc/qapi_domain et al
 sphinx==3.4.3
diff --git a/pythondeps.toml b/pythondeps.toml
index a0717742423..c843f163a8f 100644
--- a/pythondeps.toml
+++ b/pythondeps.toml
@@ -38,14 +38,16 @@ sphinx_rtd_theme = { accepted = ">=0.5", installed = "1.2.2" }
 [tooling]
 "qemu.qmp" = { accepted = ">=0.0.5", installed = "0.0.5" }
 "qemu" = { path = "python/" }
-# NB: The following dependencies should be a little bit more modern than
-# the versions listed here, but we are still using Debian 11 for several
-# GitLab CI tests, so we are further restricted.
-"setuptools" = { accepted = ">=44.1.1" }
-"wheel" = { accepted = ">=0.34.2" }
-# pip should be guaranteed by mkvenv, this is merely a sanity check for
-# which version we are counting on being present.
-"pip" = { accepted = ">=20.3.4" }
+# These dependencies largely serve as sanity checks and a place to
+# record our current accepted minimum versions of various python
+# packaging modules; in offline mode, the absence of these modules will
+# cause configure to fail.
+#
+# We are currently constrained by CentOS Stream 9.
+"setuptools" = { accepted = ">=53.0.0" }
+"wheel" = { accepted = ">=0.36.2" }
+# Guaranteed by mkvenv, sanity-check only
+"pip" = { accepted = ">=21.3.1" }
 
 # This test group is for functional tests, and can include dependencies
 # fetched from PyPI.
-- 
2.53.0

Re: [PATCH v2 2/3] tests: upgrade debian-legacy-test-cross to debian 13

[Alex Bennée]

John Snow <jsnow@redhat.com> writes:

> We no longer require Debian 11 to run these tests; they work properly
> under Debian 13/Trixie.
>
> Signed-off-by: John Snow <jsnow@redhat.com>
 
If these all work with Debian 13 we should just punt the compilers into
debian-all-test-cross and delete this container and redirect its users.

> ---
>  .../dockerfiles/debian-legacy-test-cross.docker  | 16 +++++-----------
>  1 file changed, 5 insertions(+), 11 deletions(-)
>
> diff --git a/tests/docker/dockerfiles/debian-legacy-test-cross.docker b/tests/docker/dockerfiles/debian-legacy-test-cross.docker
> index 5a6616b7d39..293f31a07d6 100644
> --- a/tests/docker/dockerfiles/debian-legacy-test-cross.docker
> +++ b/tests/docker/dockerfiles/debian-legacy-test-cross.docker
> @@ -1,18 +1,13 @@
>  # Docker legacy cross-compiler target (tests and minimal qemu)
>  #
> -# Compilers for some of our older targets which we cant currently
> -# upgrade. Currently:
> -#
> -#   libc6.1-dev-alpha-cross: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1054412
> -#   sh4-linux-user: binaries don't run with bookworm compiler
> -#
>  # As we are targeting check-tcg here we only need minimal qemu
>  # dependencies and the relevant cross compilers.
>  
> -FROM docker.io/library/debian:11-slim
> +FROM docker.io/library/debian:13-slim
>  
> -# Duplicate deb line as deb-src
> -RUN cat /etc/apt/sources.list | sed "s/^deb\ /deb-src /" >> /etc/apt/sources.list
> +# Add deb-src repository sources
> +RUN sed -i "s/^Types: deb$/Types: deb deb-src/" \
> +    /etc/apt/sources.list.d/debian.sources
>  
>  RUN export DEBIAN_FRONTEND=noninteractive && \
>      apt-get update && \
> @@ -35,12 +30,11 @@ RUN DEBIAN_FRONTEND=noninteractive eatmydata \
>          libc6-dev-sh4-cross \
>          python3-pip \
>          python3-setuptools \
> +        python3-tomli \
>          python3-venv \
>          python3-wheel && \
>          dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --show > /packages.txt
>  
> -RUN /usr/bin/pip3 install tomli
> -
>  ENV QEMU_CONFIGURE_OPTS --disable-system --disable-docs --disable-tools
>  ENV DEF_TARGET_LIST alpha-linux-user,sh4-linux-user
>  ENV MAKE /usr/bin/make

-- 
Alex Bennée
Virtualisation Tech Lead @ Linaro

Re: [PATCH v2 3/3] python: upgrade minimum setuptools/wheel/pip versions

[Thomas Huth]

On 25/02/2026 20.38, John Snow wrote:
> With Debian 11 tests removed from our CI suite, we are allowed to rely
> on the versions present in CentOS Stream 9 as a new minimum.
> 
> Note that CentOS Stream 9 does offer Python 3.12 packages, but mandating
> this incurs the loss of ability to build offline documentation on CentOS
> because there is no official Sphinx package for Python 3.12. We will
> very likely mandate these upgraded packages for QEMU 11.1, but there is
> no real benefit to doing it now for 11.0 - It will be simpler to perform
> that upgrade after QEMU drops support for Ubuntu 22.04 LTS in late
> April.
> 
> See
> https://gitlab.com/jsnow/repology-dashboard#results-overview-as-of-2026-02-16
> for more details on current Python ecosystem versions across all of our
> supported build platforms.
> 
> Signed-off-by: John Snow <jsnow@redhat.com>
> ---
>   python/tests/minreqs.txt |  1 +
>   pythondeps.toml          | 18 ++++++++++--------
>   2 files changed, 11 insertions(+), 8 deletions(-)
Reviewed-by: Thomas Huth <thuth@redhat.com>

Re: [PATCH v2 3/3] python: upgrade minimum setuptools/wheel/pip versions

[Daniel P. Berrangé]

On Wed, Feb 25, 2026 at 02:38:56PM -0500, John Snow wrote:
> With Debian 11 tests removed from our CI suite, we are allowed to rely
> on the versions present in CentOS Stream 9 as a new minimum.
> 
> Note that CentOS Stream 9 does offer Python 3.12 packages, but mandating
> this incurs the loss of ability to build offline documentation on CentOS
> because there is no official Sphinx package for Python 3.12. We will
> very likely mandate these upgraded packages for QEMU 11.1, but there is
> no real benefit to doing it now for 11.0 - It will be simpler to perform
> that upgrade after QEMU drops support for Ubuntu 22.04 LTS in late
> April.
> 
> See
> https://gitlab.com/jsnow/repology-dashboard#results-overview-as-of-2026-02-16
> for more details on current Python ecosystem versions across all of our
> supported build platforms.
> 
> Signed-off-by: John Snow <jsnow@redhat.com>
> ---
>  python/tests/minreqs.txt |  1 +
>  pythondeps.toml          | 18 ++++++++++--------
>  2 files changed, 11 insertions(+), 8 deletions(-)

Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>

With regards,
Daniel
-- 
|: https://berrange.com       ~~        https://hachyderm.io/@berrange :|
|: https://libvirt.org          ~~          https://entangle-photo.org :|
|: https://pixelfed.art/berrange   ~~    https://fstop138.berrange.com :|

Re: [PATCH v2 2/3] tests: upgrade debian-legacy-test-cross to debian 13

[Daniel P. Berrangé]

On Wed, Feb 25, 2026 at 02:38:55PM -0500, John Snow wrote:
> We no longer require Debian 11 to run these tests; they work properly
> under Debian 13/Trixie.
> 
> Signed-off-by: John Snow <jsnow@redhat.com>
> ---
>  .../dockerfiles/debian-legacy-test-cross.docker  | 16 +++++-----------
>  1 file changed, 5 insertions(+), 11 deletions(-)

Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>


With regards,
Daniel
-- 
|: https://berrange.com       ~~        https://hachyderm.io/@berrange :|
|: https://libvirt.org          ~~          https://entangle-photo.org :|
|: https://pixelfed.art/berrange   ~~    https://fstop138.berrange.com :|

Re: [PATCH v2 1/3] tests: upgrade most non-lcitool debian tests to debian 13

[Daniel P. Berrangé]

On Wed, Feb 25, 2026 at 02:38:54PM -0500, John Snow wrote:
> 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>
> ---
>  tests/docker/dockerfiles/debian-hexagon-cross.docker  | 11 ++++++-----
>  .../docker/dockerfiles/debian-loongarch-cross.docker  | 10 +++++-----
>  tests/docker/dockerfiles/debian-toolchain.docker      |  8 +++++---
>  tests/docker/dockerfiles/debian-tricore-cross.docker  |  5 ++---
>  tests/docker/dockerfiles/debian-xtensa-cross.docker   |  2 +-
>  5 files changed, 19 insertions(+), 17 deletions(-)

Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>


With regards,
Daniel
-- 
|: https://berrange.com       ~~        https://hachyderm.io/@berrange :|
|: https://libvirt.org          ~~          https://entangle-photo.org :|
|: https://pixelfed.art/berrange   ~~    https://fstop138.berrange.com :|

Re: [PATCH v2 2/3] tests: upgrade debian-legacy-test-cross to debian 13

[John Snow]

[-- Attachment #1: Type: text/plain, Size: 2584 bytes --]

On Wed, Feb 25, 2026, 5:57 PM Alex Bennée <alex.bennee@linaro.org> wrote:

> John Snow <jsnow@redhat.com> writes:
>
> > We no longer require Debian 11 to run these tests; they work properly
> > under Debian 13/Trixie.
> >
> > Signed-off-by: John Snow <jsnow@redhat.com>
>
> If these all work with Debian 13 we should just punt the compilers into
> debian-all-test-cross and delete this container and redirect its users.
>

Alright, wasn't sure where you wanted em. I'll give it a shot.


> > ---
> >  .../dockerfiles/debian-legacy-test-cross.docker  | 16 +++++-----------
> >  1 file changed, 5 insertions(+), 11 deletions(-)
> >
> > diff --git a/tests/docker/dockerfiles/debian-legacy-test-cross.docker
> b/tests/docker/dockerfiles/debian-legacy-test-cross.docker
> > index 5a6616b7d39..293f31a07d6 100644
> > --- a/tests/docker/dockerfiles/debian-legacy-test-cross.docker
> > +++ b/tests/docker/dockerfiles/debian-legacy-test-cross.docker
> > @@ -1,18 +1,13 @@
> >  # Docker legacy cross-compiler target (tests and minimal qemu)
> >  #
> > -# Compilers for some of our older targets which we cant currently
> > -# upgrade. Currently:
> > -#
> > -#   libc6.1-dev-alpha-cross:
> https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1054412
> > -#   sh4-linux-user: binaries don't run with bookworm compiler
> > -#
> >  # As we are targeting check-tcg here we only need minimal qemu
> >  # dependencies and the relevant cross compilers.
> >
> > -FROM docker.io/library/debian:11-slim
> > +FROM docker.io/library/debian:13-slim
> >
> > -# Duplicate deb line as deb-src
> > -RUN cat /etc/apt/sources.list | sed "s/^deb\ /deb-src /" >>
> /etc/apt/sources.list
> > +# Add deb-src repository sources
> > +RUN sed -i "s/^Types: deb$/Types: deb deb-src/" \
> > +    /etc/apt/sources.list.d/debian.sources
> >
> >  RUN export DEBIAN_FRONTEND=noninteractive && \
> >      apt-get update && \
> > @@ -35,12 +30,11 @@ RUN DEBIAN_FRONTEND=noninteractive eatmydata \
> >          libc6-dev-sh4-cross \
> >          python3-pip \
> >          python3-setuptools \
> > +        python3-tomli \
> >          python3-venv \
> >          python3-wheel && \
> >          dpkg-query --showformat
> '${Package}_${Version}_${Architecture}\n' --show > /packages.txt
> >
> > -RUN /usr/bin/pip3 install tomli
> > -
> >  ENV QEMU_CONFIGURE_OPTS --disable-system --disable-docs --disable-tools
> >  ENV DEF_TARGET_LIST alpha-linux-user,sh4-linux-user
> >  ENV MAKE /usr/bin/make
>
> --
> Alex Bennée
> Virtualisation Tech Lead @ Linaro
>
>

[-- Attachment #2: Type: text/html, Size: 4004 bytes --]

Re: [PATCH v2 1/3] tests: upgrade most non-lcitool debian tests to debian 13

[Alex Bennée]

John Snow <jsnow@redhat.com> writes:

> 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>

Queued to testing/next, thanks.

-- 
Alex Bennée
Virtualisation Tech Lead @ Linaro