[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 13/19] tests/docker: use debian-all-test-cross for riscv64
From: |
Alex Bennée |
Subject: |
[PULL 13/19] tests/docker: use debian-all-test-cross for riscv64 |
Date: |
Tue, 31 Oct 2023 14:43:55 +0000 |
Maintaining two sets of containers for test building is silly. While
it makes sense for the QEMU cross-compile targets to have their own
fat containers built by lcitool we might as well merge the other
random debian based compilers into the same one used on gitlab.
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Message-Id: <20231029145033.592566-14-alex.bennee@linaro.org>
diff --git a/configure b/configure
index 791c48c4e4..0e0f0c60b5 100755
--- a/configure
+++ b/configure
@@ -1347,6 +1347,10 @@ probe_target_compiler() {
container_image=debian-all-test-cross
container_cross_prefix=powerpc${target_arch#ppc}-linux-gnu-
;;
+ riscv64)
+ container_image=debian-all-test-cross
+ container_cross_prefix=riscv64-linux-gnu-
+ ;;
sh4)
container_image=debian-legacy-test-cross
container_cross_prefix=sh4-linux-gnu-
diff --git a/.gitlab-ci.d/container-cross.yml b/.gitlab-ci.d/container-cross.yml
index 053330d6f4..98940d0f3b 100644
--- a/.gitlab-ci.d/container-cross.yml
+++ b/.gitlab-ci.d/container-cross.yml
@@ -73,13 +73,6 @@ riscv64-debian-cross-container:
NAME: debian-riscv64-cross
QEMU_JOB_OPTIONAL: 1
-# we can however build TCG tests using a non-sid base
-riscv64-debian-test-cross-container:
- extends: .container_job_template
- stage: containers
- variables:
- NAME: debian-riscv64-test-cross
-
s390x-debian-cross-container:
extends: .container_job_template
stage: containers
diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include
index dfa9617bb9..dc55ecf001 100644
--- a/tests/docker/Makefile.include
+++ b/tests/docker/Makefile.include
@@ -124,7 +124,6 @@ docker-image-debian-nios2-cross:
$(DOCKER_FILES_DIR)/debian-toolchain.docker \
# These images may be good enough for building tests but not for test builds
DOCKER_PARTIAL_IMAGES += debian-microblaze-cross
DOCKER_PARTIAL_IMAGES += debian-nios2-cross
-DOCKER_PARTIAL_IMAGES += debian-riscv64-test-cross
DOCKER_PARTIAL_IMAGES += debian-sparc64-cross
DOCKER_PARTIAL_IMAGES += debian-xtensa-cross
DOCKER_PARTIAL_IMAGES += fedora-cris-cross
diff --git a/tests/docker/dockerfiles/debian-riscv64-test-cross.docker
b/tests/docker/dockerfiles/debian-riscv64-test-cross.docker
deleted file mode 100644
index 6e631295bc..0000000000
--- a/tests/docker/dockerfiles/debian-riscv64-test-cross.docker
+++ /dev/null
@@ -1,19 +0,0 @@
-#
-# Docker cross-compiler target
-#
-# This docker target builds on the Debian Bullseye base image.
-#
-FROM docker.io/library/debian:11-slim
-
-RUN export DEBIAN_FRONTEND=noninteractive && \
- apt-get update && \
- apt-get install -y eatmydata && \
- eatmydata apt-get dist-upgrade -y && \
- eatmydata apt-get install --no-install-recommends -y \
- gcc-riscv64-linux-gnu \
- libc6-dev-riscv64-cross
-# As a final step configure the user (if env is defined)
-ARG USER
-ARG UID
-RUN if [ "${USER}" ]; then \
- id ${USER} 2>/dev/null || useradd -u ${UID} -U ${USER}; fi
--
2.39.2
- [PULL 00/19] Updates for testing, gitlab, gdbstub, plugins and semihosting, Alex Bennée, 2023/10/31
- [PULL 02/19] tests/tcg: Add -fno-stack-protector, Alex Bennée, 2023/10/31
- [PULL 01/19] tests/vm/openbsd: Use the system dtc package, Alex Bennée, 2023/10/31
- [PULL 04/19] gitlab: clean-up build-soft-softmmu job, Alex Bennée, 2023/10/31
- [PULL 03/19] gitlab: split alpha testing into a legacy container, Alex Bennée, 2023/10/31
- [PULL 05/19] gitlab: add build-loongarch to matrix, Alex Bennée, 2023/10/31
- [PULL 06/19] tests/docker: use debian-legacy-test-cross for alpha, Alex Bennée, 2023/10/31
- [PULL 10/19] tests/docker: use debian-all-test-cross for m68k, Alex Bennée, 2023/10/31
- [PULL 08/19] tests/docker: use debian-all-test-cross for power, Alex Bennée, 2023/10/31
- [PULL 13/19] tests/docker: use debian-all-test-cross for riscv64,
Alex Bennée <=
- [PULL 07/19] tests/docker: move sh4 to use debian-legacy-test-cross, Alex Bennée, 2023/10/31
- [PULL 09/19] tests/docker: use debian-all-test-cross for hppa, Alex Bennée, 2023/10/31
- [PULL 14/19] tests/docker: use debian-all-test-cross for sparc64, Alex Bennée, 2023/10/31
- [PULL 11/19] tests/docker: use debian-all-test-cross for mips64, Alex Bennée, 2023/10/31
- [PULL 15/19] tests/docker: upgrade debian-all-test-cross to bookworm, Alex Bennée, 2023/10/31
- [PULL 12/19] tests/docker: use debian-all-test-cross for mips, Alex Bennée, 2023/10/31
- [PULL 17/19] semihosting: fix memleak at semihosting_arg_fallback, Alex Bennée, 2023/10/31
- [PULL 16/19] gdbstub: Check if gdb_regs is NULL, Alex Bennée, 2023/10/31
- [PULL 19/19] contrib/plugins: Close file descriptor on error return, Alex Bennée, 2023/10/31
- [PULL 18/19] plugins: Remove an extra parameter, Alex Bennée, 2023/10/31