gitlab: split alpha testing into a legacy container
The current bookworm compiler doesn't build the static binaries due to bug #1054412 and it might be awhile before it gets fixed. The problem of keeping older architecture compilers running isn't going to go away so lets prepare the ground. Create a legacy container and move some tests around so the others can get upgraded. Reviewed-by: Richard Henderson <richard.henderson@linaro.org> Signed-off-by: Alex Bennée <alex.bennee@linaro.org> Message-Id: <20231029145033.592566-4-alex.bennee@linaro.org>
This commit is contained in:
parent
580731dcc8
commit
aa39c4c098
@ -256,6 +256,7 @@ build-user:
|
|||||||
variables:
|
variables:
|
||||||
IMAGE: debian-all-test-cross
|
IMAGE: debian-all-test-cross
|
||||||
CONFIGURE_ARGS: --disable-tools --disable-system
|
CONFIGURE_ARGS: --disable-tools --disable-system
|
||||||
|
--target-list-exclude=alpha-linux-user
|
||||||
MAKE_CHECK_ARGS: check-tcg
|
MAKE_CHECK_ARGS: check-tcg
|
||||||
|
|
||||||
build-user-static:
|
build-user-static:
|
||||||
@ -265,6 +266,18 @@ build-user-static:
|
|||||||
variables:
|
variables:
|
||||||
IMAGE: debian-all-test-cross
|
IMAGE: debian-all-test-cross
|
||||||
CONFIGURE_ARGS: --disable-tools --disable-system --static
|
CONFIGURE_ARGS: --disable-tools --disable-system --static
|
||||||
|
--target-list-exclude=alpha-linux-user
|
||||||
|
MAKE_CHECK_ARGS: check-tcg
|
||||||
|
|
||||||
|
# targets stuck on older compilers
|
||||||
|
build-legacy:
|
||||||
|
extends: .native_build_job_template
|
||||||
|
needs:
|
||||||
|
job: amd64-debian-legacy-cross-container
|
||||||
|
variables:
|
||||||
|
IMAGE: debian-legacy-test-cross
|
||||||
|
TARGETS: alpha-linux-user alpha-softmmu
|
||||||
|
CONFIGURE_ARGS: --disable-tools
|
||||||
MAKE_CHECK_ARGS: check-tcg
|
MAKE_CHECK_ARGS: check-tcg
|
||||||
|
|
||||||
build-user-hexagon:
|
build-user-hexagon:
|
||||||
@ -285,7 +298,7 @@ build-some-softmmu:
|
|||||||
variables:
|
variables:
|
||||||
IMAGE: debian-all-test-cross
|
IMAGE: debian-all-test-cross
|
||||||
CONFIGURE_ARGS: --disable-tools --enable-debug
|
CONFIGURE_ARGS: --disable-tools --enable-debug
|
||||||
TARGETS: xtensa-softmmu arm-softmmu aarch64-softmmu alpha-softmmu
|
TARGETS: xtensa-softmmu arm-softmmu aarch64-softmmu
|
||||||
MAKE_CHECK_ARGS: check-tcg
|
MAKE_CHECK_ARGS: check-tcg
|
||||||
|
|
||||||
# We build tricore in a very minimal tricore only container
|
# We build tricore in a very minimal tricore only container
|
||||||
@ -318,7 +331,7 @@ clang-user:
|
|||||||
variables:
|
variables:
|
||||||
IMAGE: debian-all-test-cross
|
IMAGE: debian-all-test-cross
|
||||||
CONFIGURE_ARGS: --cc=clang --cxx=clang++ --disable-system
|
CONFIGURE_ARGS: --cc=clang --cxx=clang++ --disable-system
|
||||||
--target-list-exclude=microblazeel-linux-user,aarch64_be-linux-user,i386-linux-user,m68k-linux-user,mipsn32el-linux-user,xtensaeb-linux-user
|
--target-list-exclude=alpha-linux-user,microblazeel-linux-user,aarch64_be-linux-user,i386-linux-user,m68k-linux-user,mipsn32el-linux-user,xtensaeb-linux-user
|
||||||
--extra-cflags=-fsanitize=undefined --extra-cflags=-fno-sanitize-recover=undefined
|
--extra-cflags=-fsanitize=undefined --extra-cflags=-fno-sanitize-recover=undefined
|
||||||
MAKE_CHECK_ARGS: check-unit check-tcg
|
MAKE_CHECK_ARGS: check-unit check-tcg
|
||||||
|
|
||||||
@ -505,7 +518,7 @@ build-tci:
|
|||||||
variables:
|
variables:
|
||||||
IMAGE: debian-all-test-cross
|
IMAGE: debian-all-test-cross
|
||||||
script:
|
script:
|
||||||
- TARGETS="aarch64 alpha arm hppa m68k microblaze ppc64 s390x x86_64"
|
- TARGETS="aarch64 arm hppa m68k microblaze ppc64 s390x x86_64"
|
||||||
- mkdir build
|
- mkdir build
|
||||||
- cd build
|
- cd build
|
||||||
- ../configure --enable-tcg-interpreter --disable-docs --disable-gtk --disable-vnc
|
- ../configure --enable-tcg-interpreter --disable-docs --disable-gtk --disable-vnc
|
||||||
|
@ -16,6 +16,12 @@ amd64-debian-user-cross-container:
|
|||||||
variables:
|
variables:
|
||||||
NAME: debian-all-test-cross
|
NAME: debian-all-test-cross
|
||||||
|
|
||||||
|
amd64-debian-legacy-cross-container:
|
||||||
|
extends: .container_job_template
|
||||||
|
stage: containers
|
||||||
|
variables:
|
||||||
|
NAME: debian-legacy-test-cross
|
||||||
|
|
||||||
arm64-debian-cross-container:
|
arm64-debian-cross-container:
|
||||||
extends: .container_job_template
|
extends: .container_job_template
|
||||||
stage: containers
|
stage: containers
|
||||||
|
@ -28,8 +28,6 @@ RUN DEBIAN_FRONTEND=noninteractive eatmydata \
|
|||||||
ninja-build \
|
ninja-build \
|
||||||
gcc-aarch64-linux-gnu \
|
gcc-aarch64-linux-gnu \
|
||||||
libc6-dev-arm64-cross \
|
libc6-dev-arm64-cross \
|
||||||
gcc-alpha-linux-gnu \
|
|
||||||
libc6.1-dev-alpha-cross \
|
|
||||||
gcc-arm-linux-gnueabihf \
|
gcc-arm-linux-gnueabihf \
|
||||||
libc6-dev-armhf-cross \
|
libc6-dev-armhf-cross \
|
||||||
gcc-hppa-linux-gnu \
|
gcc-hppa-linux-gnu \
|
||||||
@ -66,7 +64,7 @@ RUN DEBIAN_FRONTEND=noninteractive eatmydata \
|
|||||||
RUN /usr/bin/pip3 install tomli
|
RUN /usr/bin/pip3 install tomli
|
||||||
|
|
||||||
ENV QEMU_CONFIGURE_OPTS --disable-system --disable-docs --disable-tools
|
ENV QEMU_CONFIGURE_OPTS --disable-system --disable-docs --disable-tools
|
||||||
ENV DEF_TARGET_LIST aarch64-linux-user,alpha-linux-user,arm-linux-user,hppa-linux-user,i386-linux-user,m68k-linux-user,mips-linux-user,mips64-linux-user,mips64el-linux-user,mipsel-linux-user,ppc-linux-user,ppc64-linux-user,ppc64le-linux-user,riscv64-linux-user,s390x-linux-user,sh4-linux-user,sparc64-linux-user
|
ENV DEF_TARGET_LIST aarch64-linux-user,arm-linux-user,hppa-linux-user,i386-linux-user,m68k-linux-user,mips-linux-user,mips64-linux-user,mips64el-linux-user,mipsel-linux-user,ppc-linux-user,ppc64-linux-user,ppc64le-linux-user,riscv64-linux-user,s390x-linux-user,sh4-linux-user,sparc64-linux-user
|
||||||
# As a final step configure the user (if env is defined)
|
# As a final step configure the user (if env is defined)
|
||||||
ARG USER
|
ARG USER
|
||||||
ARG UID
|
ARG UID
|
||||||
|
46
tests/docker/dockerfiles/debian-legacy-test-cross.docker
Normal file
46
tests/docker/dockerfiles/debian-legacy-test-cross.docker
Normal file
@ -0,0 +1,46 @@
|
|||||||
|
# Docker legacy cross-compiler target (tests and minimal qemu)
|
||||||
|
#
|
||||||
|
# Compilers for some of our older targets which we cant currently
|
||||||
|
# upgrade. Currently:
|
||||||
|
#
|
||||||
|
# libc6.1-dev-alpha-cross: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1054412
|
||||||
|
#
|
||||||
|
# As we are targeting check-tcg here we only need minimal qemu
|
||||||
|
# dependencies and the relevant cross compilers.
|
||||||
|
|
||||||
|
FROM docker.io/library/debian:11-slim
|
||||||
|
|
||||||
|
# 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 extra build tools and as many cross compilers as we can for testing
|
||||||
|
RUN DEBIAN_FRONTEND=noninteractive eatmydata \
|
||||||
|
apt install -y --no-install-recommends \
|
||||||
|
bison \
|
||||||
|
ccache \
|
||||||
|
clang \
|
||||||
|
flex \
|
||||||
|
git \
|
||||||
|
ninja-build \
|
||||||
|
gcc-alpha-linux-gnu \
|
||||||
|
libc6.1-dev-alpha-cross \
|
||||||
|
python3-pip \
|
||||||
|
python3-setuptools \
|
||||||
|
python3-venv \
|
||||||
|
python3-wheel
|
||||||
|
|
||||||
|
RUN /usr/bin/pip3 install tomli
|
||||||
|
|
||||||
|
ENV QEMU_CONFIGURE_OPTS --disable-system --disable-docs --disable-tools
|
||||||
|
ENV DEF_TARGET_LIST alpha-linux-user
|
||||||
|
# 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
|
Loading…
Reference in New Issue
Block a user