[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 23/30] tests/docker: update and flatten debian-all-test-cross
From: |
Alex Bennée |
Subject: |
[PULL 23/30] tests/docker: update and flatten debian-all-test-cross |
Date: |
Tue, 20 Sep 2022 18:15:26 +0100 |
Update to the latest stable Debian. While we are at it flatten into a
single dockerfile. We also need to ensure we install clang as it is
used for those builds as well.
It would be nice to port this to lcitool but for now this will do.
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <20220914155950.804707-24-alex.bennee@linaro.org>
diff --git a/.gitlab-ci.d/container-cross.yml b/.gitlab-ci.d/container-cross.yml
index 3a8bd75473..091c0d8fcb 100644
--- a/.gitlab-ci.d/container-cross.yml
+++ b/.gitlab-ci.d/container-cross.yml
@@ -14,7 +14,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 24cd44e667..ddcc502049 100644
--- a/tests/docker/Makefile.include
+++ b/tests/docker/Makefile.include
@@ -129,7 +129,6 @@ docker-image-debian-nios2-cross:
$(DOCKER_FILES_DIR)/debian-toolchain.docker \
$(call debian-toolchain, $@)
# Specialist build images, sometimes very limited tools
-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..2beb077fb4 100644
--- a/tests/docker/dockerfiles/debian-all-test-cross.docker
+++ b/tests/docker/dockerfiles/debian-all-test-cross.docker
@@ -6,16 +6,24 @@
# 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:11-slim
-# What we need to build QEMU itself
-RUN apt update && \
- DEBIAN_FRONTEND=noninteractive eatmydata \
+# Duplicate deb line as deb-src
+RUN cat /etc/apt/sources.list | sed "s/^deb\ /deb-src /" >>
/etc/apt/sources.list
+
+RUN export DEBIAN_FRONTEND=noninteractive && \
+ apt-get update && \
+ apt-get install -y eatmydata && \
+ eatmydata apt-get dist-upgrade -y && \
apt build-dep -yy qemu
-# Add the foreign architecture we want and install dependencies
+# Add extra build tools and as many cross compilers as we can for testing
RUN DEBIAN_FRONTEND=noninteractive eatmydata \
apt install -y --no-install-recommends \
+ ccache \
+ clang \
+ git \
+ ninja-build \
gcc-aarch64-linux-gnu \
libc6-dev-arm64-cross \
gcc-alpha-linux-gnu \
--
2.34.1
- [PULL 25/30] tests/docker: update and flatten debian-amd64-cross, (continued)
- [PULL 25/30] tests/docker: update and flatten debian-amd64-cross, Alex Bennée, 2022/09/20
- [PULL 24/30] tests/lcitool: bump to latest version, Alex Bennée, 2022/09/20
- [PULL 27/30] tests/docker: update and flatten debian-hexagon-cross, Alex Bennée, 2022/09/20
- [PULL 20/30] gitlab-ci: update aarch32/aarch64 custom runner jobs, Alex Bennée, 2022/09/20
- [PULL 29/30] tests/docker: remove FROM qemu/ support from docker.py, Alex Bennée, 2022/09/20
- [PULL 21/30] Deprecate 32 bit big-endian MIPS, Alex Bennée, 2022/09/20
- [PULL 12/30] tests/docker: update and flatten debian-sh4-cross, Alex Bennée, 2022/09/20
- [PULL 30/30] tests/docker: remove the Debian base images, Alex Bennée, 2022/09/20
- [PULL 26/30] tests/docker: update and flatten debian-loongarch-cross, Alex Bennée, 2022/09/20
- [PULL 18/30] configure: explicitly set cflags for --disable-pie, Alex Bennée, 2022/09/20
- [PULL 23/30] tests/docker: update and flatten debian-all-test-cross,
Alex Bennée <=
- [PULL 28/30] tests/docker: update and flatten debian-toolchain, Alex Bennée, 2022/09/20
- [PULL 14/30] tests/docker: flatten debian-powerpc-test-cross, Alex Bennée, 2022/09/20
- Re: [PULL 00/30] testing updates (docker, avocado, deprecate 32bit BE MIPS), Stefan Hajnoczi, 2022/09/22