aboutsummaryrefslogtreecommitdiff
path: root/.gitlab-ci.d
diff options
context:
space:
mode:
authorAlex Bennée <alex.bennee@linaro.org>2023-10-29 14:50:18 +0000
committerAlex Bennée <alex.bennee@linaro.org>2023-10-31 13:28:30 +0000
commit6f6c399976933d3c77cb0f516d5d8bbfc0fad2b0 (patch)
tree3a1d6e67dd0b1075e4eff6748ffc8d021023708d /.gitlab-ci.d
parentaa39c4c098190e49eaf8854046dcc1827770f890 (diff)
gitlab: clean-up build-soft-softmmu job
Having dropped alpha we also now drop xtensa as we don't have the compiler in this image. It's not all doom and gloom though as a number of other targets have gained softmmu TCG tests so we can add them. We will take care of the other targets with their own containers in future commits. Reviewed-by: Richard Henderson <richard.henderson@linaro.org> Signed-off-by: Alex Bennée <alex.bennee@linaro.org> Message-Id: <20231029145033.592566-5-alex.bennee@linaro.org>
Diffstat (limited to '.gitlab-ci.d')
-rw-r--r--.gitlab-ci.d/buildtest.yml8
1 files changed, 6 insertions, 2 deletions
diff --git a/.gitlab-ci.d/buildtest.yml b/.gitlab-ci.d/buildtest.yml
index bb24e052f6..5e9cbf9385 100644
--- a/.gitlab-ci.d/buildtest.yml
+++ b/.gitlab-ci.d/buildtest.yml
@@ -290,7 +290,9 @@ build-user-hexagon:
CONFIGURE_ARGS: --disable-tools --disable-docs --enable-debug-tcg
MAKE_CHECK_ARGS: check-tcg
-# Only build the softmmu targets we have check-tcg tests for
+# Build the softmmu targets we have check-tcg tests and compilers in
+# our omnibus all-test-cross container. Those targets that haven't got
+# Debian cross compiler support need to use special containers.
build-some-softmmu:
extends: .native_build_job_template
needs:
@@ -298,7 +300,9 @@ build-some-softmmu:
variables:
IMAGE: debian-all-test-cross
CONFIGURE_ARGS: --disable-tools --enable-debug
- TARGETS: xtensa-softmmu arm-softmmu aarch64-softmmu
+ TARGETS: arm-softmmu aarch64-softmmu i386-softmmu riscv64-softmmu
+ s390x-softmmu x86_64-softmmu
+ MAKE_CHECK_ARGS: check-tcg
MAKE_CHECK_ARGS: check-tcg
# We build tricore in a very minimal tricore only container