We now restrict those containers to amd64 variants only. Signed-off-by: Pierrick Bouvier <[email protected]> --- tests/docker/dockerfiles/debian-all-test-cross.docker | 2 +- tests/docker/dockerfiles/debian-amd64-cross.docker | 2 +- tests/docker/dockerfiles/debian-hexagon-cross.docker | 2 +- tests/docker/dockerfiles/debian-i686-cross.docker | 2 +- tests/docker/dockerfiles/debian-loongarch-cross.docker | 2 +- tests/docker/dockerfiles/debian-tricore-cross.docker | 2 +- tests/docker/dockerfiles/debian-xtensa-cross.docker | 2 +- tests/lcitool/refresh | 6 ++++++ 8 files changed, 13 insertions(+), 7 deletions(-)
diff --git a/tests/docker/dockerfiles/debian-all-test-cross.docker b/tests/docker/dockerfiles/debian-all-test-cross.docker index c0ab05a5ff3..b6aba26c0c8 100644 --- a/tests/docker/dockerfiles/debian-all-test-cross.docker +++ b/tests/docker/dockerfiles/debian-all-test-cross.docker @@ -4,7 +4,7 @@ # # https://gitlab.com/libvirt/libvirt-ci -FROM docker.io/library/debian:13-slim +FROM docker.io/amd64/debian:13-slim RUN export DEBIAN_FRONTEND=noninteractive && \ apt-get update && \ diff --git a/tests/docker/dockerfiles/debian-amd64-cross.docker b/tests/docker/dockerfiles/debian-amd64-cross.docker index 975b9f346e6..728803aeaa1 100644 --- a/tests/docker/dockerfiles/debian-amd64-cross.docker +++ b/tests/docker/dockerfiles/debian-amd64-cross.docker @@ -4,7 +4,7 @@ # # https://gitlab.com/libvirt/libvirt-ci -FROM docker.io/library/debian:13-slim +FROM docker.io/amd64/debian:13-slim RUN export DEBIAN_FRONTEND=noninteractive && \ apt-get update && \ diff --git a/tests/docker/dockerfiles/debian-hexagon-cross.docker b/tests/docker/dockerfiles/debian-hexagon-cross.docker index e07a2be37e2..7753eab9706 100644 --- a/tests/docker/dockerfiles/debian-hexagon-cross.docker +++ b/tests/docker/dockerfiles/debian-hexagon-cross.docker @@ -5,7 +5,7 @@ # needs to be able to build QEMU itself in CI we include its # build-deps. # -FROM docker.io/library/debian:13-slim +FROM docker.io/amd64/debian:13-slim # Add deb-src repository sources RUN sed -i "s/^Types: deb$/Types: deb deb-src/" \ diff --git a/tests/docker/dockerfiles/debian-i686-cross.docker b/tests/docker/dockerfiles/debian-i686-cross.docker index a60b72e05b9..1b8f9609b2a 100644 --- a/tests/docker/dockerfiles/debian-i686-cross.docker +++ b/tests/docker/dockerfiles/debian-i686-cross.docker @@ -4,7 +4,7 @@ # # https://gitlab.com/libvirt/libvirt-ci -FROM docker.io/library/debian:13-slim +FROM docker.io/amd64/debian:13-slim RUN export DEBIAN_FRONTEND=noninteractive && \ apt-get update && \ diff --git a/tests/docker/dockerfiles/debian-loongarch-cross.docker b/tests/docker/dockerfiles/debian-loongarch-cross.docker index d2ba07972ce..a053486cf3b 100644 --- a/tests/docker/dockerfiles/debian-loongarch-cross.docker +++ b/tests/docker/dockerfiles/debian-loongarch-cross.docker @@ -4,7 +4,7 @@ # This docker target uses prebuilt toolchains for LoongArch64 from: # https://github.com/loongson/build-tools/releases # -FROM docker.io/library/debian:13-slim +FROM docker.io/amd64/debian:13-slim # Add deb-src repository sources RUN sed -i "s/^Types: deb$/Types: deb deb-src/" \ diff --git a/tests/docker/dockerfiles/debian-tricore-cross.docker b/tests/docker/dockerfiles/debian-tricore-cross.docker index 9e7ff321677..94273e498b1 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:13-slim +FROM docker.io/amd64/debian:13-slim RUN apt update && \ DEBIAN_FRONTEND=noninteractive apt install -yy eatmydata && \ diff --git a/tests/docker/dockerfiles/debian-xtensa-cross.docker b/tests/docker/dockerfiles/debian-xtensa-cross.docker index 0eb6d98cc75..801768ce11d 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:13-slim +FROM docker.io/amd64/debian:13-slim RUN apt-get update && \ DEBIAN_FRONTEND=noninteractive apt install -yy eatmydata && \ diff --git a/tests/lcitool/refresh b/tests/lcitool/refresh index 4e3cbb81acf..ceabb9e978a 100755 --- a/tests/lcitool/refresh +++ b/tests/lcitool/refresh @@ -240,6 +240,8 @@ def cross_build(prefix, targets): # Please keep each group sorted alphabetically for easy reading. # +DOCKER_IO_AMD64 = "docker.io/amd64" + try: # # Standard native builds @@ -264,6 +266,7 @@ try: # Cross compiling builds # generate_dockerfile("debian-amd64-cross", "debian-13", + registry_path=DOCKER_IO_AMD64, cross="x86_64", trailer=cross_build("x86_64-linux-gnu-", "x86_64-softmmu," @@ -281,6 +284,7 @@ try: "arm-softmmu,arm-linux-user")) generate_dockerfile("debian-i686-cross", "debian-13", + registry_path=DOCKER_IO_AMD64, cross="i686", trailer=cross_build("i686-linux-gnu-", "i386-softmmu,i386-linux-user")) @@ -313,10 +317,12 @@ try: # tests. generate_dockerfile("debian-all-test-cross", "debian-13", + registry_path=DOCKER_IO_AMD64, project="qemu-minimal", enable_rust=False, trailer=debian_all_test_cross_compilers) + # # GitLab packages lists # -- 2.43.0
