The "build-tci" job in our CI is running the pxe-test that requires slirp. However, we are going to remove the slirp submodule from QEMU, so we need to run the test in a container that provides libslirp from the OS distribution. Currently, the debian-all-test-cross container that is used for the "build-tci" job is based on Debian 10 - which is not supported by QEMU anymore and does not have libslirp as a system library. Thus we really need to update the container to Debian 11 now to keep the "build-tci" job working.
Signed-off-by: Thomas Huth <th...@redhat.com> --- .gitlab-ci.d/container-cross.yml | 1 - tests/docker/Makefile.include | 1 - tests/docker/dockerfiles/debian-all-test-cross.docker | 9 ++++++++- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.d/container-cross.yml b/.gitlab-ci.d/container-cross.yml index 505b267542..0971c6ac8b 100644 --- a/.gitlab-ci.d/container-cross.yml +++ b/.gitlab-ci.d/container-cross.yml @@ -15,7 +15,6 @@ amd64-debian-cross-container: amd64-debian-user-cross-container: extends: .container_job_template stage: containers - needs: ['amd64-debian10-container'] variables: NAME: debian-all-test-cross diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index 9a45e8890b..e60588cdc9 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -139,7 +139,6 @@ docker-image-debian-nios2-cross: $(DOCKER_FILES_DIR)/debian-toolchain.docker \ # Specialist build images, sometimes very limited tools docker-image-debian-tricore-cross: docker-image-debian10 -docker-image-debian-all-test-cross: docker-image-debian10 docker-image-debian-loongarch-cross: docker-image-debian11 docker-image-debian-microblaze-cross: docker-image-debian10 docker-image-debian-nios2-cross: docker-image-debian10 diff --git a/tests/docker/dockerfiles/debian-all-test-cross.docker b/tests/docker/dockerfiles/debian-all-test-cross.docker index dedcea58b4..afdf0261d3 100644 --- a/tests/docker/dockerfiles/debian-all-test-cross.docker +++ b/tests/docker/dockerfiles/debian-all-test-cross.docker @@ -6,16 +6,23 @@ # basic compilers for as many targets as possible. We shall use this # to build and run linux-user tests on GitLab # -FROM qemu/debian10 +FROM docker.io/library/debian:bullseye-slim + +# Duplicate deb line as deb-src +RUN cat /etc/apt/sources.list | sed "s/^deb\ /deb-src /" >> /etc/apt/sources.list # What we need to build QEMU itself RUN apt update && \ + DEBIAN_FRONTEND=noninteractive apt install -yy eatmydata && \ DEBIAN_FRONTEND=noninteractive eatmydata \ apt build-dep -yy qemu # Add the foreign architecture we want and install dependencies RUN DEBIAN_FRONTEND=noninteractive eatmydata \ apt install -y --no-install-recommends \ + clang \ + git \ + gdb-multiarch \ gcc-aarch64-linux-gnu \ libc6-dev-arm64-cross \ gcc-alpha-linux-gnu \ -- 2.31.1