Skip to content

Commit

Permalink
tests/docker: use debian-legacy-test-cross for alpha
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-7-alex.bennee@linaro.org>
  • Loading branch information
stsquad committed Oct 31, 2023
1 parent cb8715b commit d004e27
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 26 deletions.
6 changes: 0 additions & 6 deletions .gitlab-ci.d/container-cross.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,3 @@
alpha-debian-cross-container:
extends: .container_job_template
stage: containers
variables:
NAME: debian-alpha-cross

amd64-debian-cross-container:
extends: .container_job_template
stage: containers
Expand Down
5 changes: 5 additions & 0 deletions configure
Original file line number Diff line number Diff line change
Expand Up @@ -1281,6 +1281,11 @@ probe_target_compiler() {
container_cross_prefix=aarch64-linux-gnu-
container_cross_cc=${container_cross_prefix}gcc
;;
alpha)
container_image=debian-legacy-test-cross
container_cross_prefix=alpha-linux-gnu-
container_cross_cc=${container_cross_prefix}gcc
;;
arm)
# We don't have any bigendian build tools so we only use this for ARM
container_image=debian-armhf-cross
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-alpha-cross
DOCKER_PARTIAL_IMAGES += debian-powerpc-test-cross
DOCKER_PARTIAL_IMAGES += debian-hppa-cross
DOCKER_PARTIAL_IMAGES += debian-m68k-cross debian-mips64-cross
Expand Down
19 changes: 0 additions & 19 deletions tests/docker/dockerfiles/debian-alpha-cross.docker

This file was deleted.

0 comments on commit d004e27

Please sign in to comment.