Skip to content

Commit

Permalink
tests/docker: use debian-all-test-cross for mips64
Browse files Browse the repository at this point in the history
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-12-alex.bennee@linaro.org>
  • Loading branch information
stsquad committed Oct 31, 2023
1 parent 9d9a573 commit 92a3165
Show file tree
Hide file tree
Showing 4 changed files with 1 addition and 27 deletions.
6 changes: 0 additions & 6 deletions .gitlab-ci.d/container-cross.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,12 +46,6 @@ loongarch-debian-cross-container:
variables:
NAME: debian-loongarch-cross

mips64-debian-cross-container:
extends: .container_job_template
stage: containers
variables:
NAME: debian-mips64-cross

mips64el-debian-cross-container:
extends: .container_job_template
stage: containers
Expand Down
2 changes: 1 addition & 1 deletion configure
Original file line number Diff line number Diff line change
Expand Up @@ -1327,7 +1327,7 @@ probe_target_compiler() {
container_cross_prefix=mips64el-linux-gnuabi64-
;;
mips64)
container_image=debian-mips64-cross
container_image=debian-all-test-cross
container_cross_prefix=mips64-linux-gnuabi64-
;;
nios2)
Expand Down
1 change: 0 additions & 1 deletion tests/docker/Makefile.include
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,6 @@ docker-image-debian-nios2-cross: $(DOCKER_FILES_DIR)/debian-toolchain.docker \
$(call debian-toolchain, $@)

# These images may be good enough for building tests but not for test builds
DOCKER_PARTIAL_IMAGES += debian-mips64-cross
DOCKER_PARTIAL_IMAGES += debian-microblaze-cross
DOCKER_PARTIAL_IMAGES += debian-mips-cross
DOCKER_PARTIAL_IMAGES += debian-nios2-cross
Expand Down
19 changes: 0 additions & 19 deletions tests/docker/dockerfiles/debian-mips64-cross.docker

This file was deleted.

0 comments on commit 92a3165

Please sign in to comment.