gitlab-ci.d/buildtest: Merge the --without-default-* jobs

Let's safe some CI minutes by merging these two jobs. We can now
also drop "--disable-capstone" since the capstone submodule has
been removed a while ago. We should rather test --disable-fdt now
to check a compilation without the "dtc" submodule (for this we
have to drop i386-softmmu from the target list unfortunately).
Additionally, the qtests with s390x and sh4 are not read for
"--without-default-devices" yet, so we can only test mips64 and
avr here now.

Message-Id: <20230130104446.1286773-5-thuth@redhat.com>
Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Fabiano Rosas <farosas@suse.de>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Signed-off-by: Thomas Huth <thuth@redhat.com>
(cherry picked from commit e030d08c2f)
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
This commit is contained in:
Thomas Huth 2023-01-30 11:44:44 +01:00 committed by Michael Tokarev
parent ca5d7bb952
commit bd650df6f7

View File

@ -560,29 +560,22 @@ build-coroutine-sigaltstack:
MAKE_CHECK_ARGS: check-unit MAKE_CHECK_ARGS: check-unit
# Check our reduced build configurations # Check our reduced build configurations
build-without-default-devices: build-without-defaults:
extends: .native_build_job_template extends: .native_build_job_template
needs: needs:
job: amd64-centos8-container job: amd64-centos8-container
variables: variables:
IMAGE: centos8 IMAGE: centos8
CONFIGURE_ARGS: --without-default-devices --disable-user
build-without-default-features:
extends: .native_build_job_template
needs:
job: amd64-fedora-container
variables:
IMAGE: fedora
CONFIGURE_ARGS: CONFIGURE_ARGS:
--without-default-devices
--without-default-features --without-default-features
--disable-capstone --disable-fdt
--disable-pie --disable-pie
--disable-qom-cast-debug --disable-qom-cast-debug
--disable-strip --disable-strip
TARGETS: avr-softmmu i386-softmmu mips64-softmmu s390x-softmmu sh4-softmmu TARGETS: avr-softmmu mips64-softmmu s390x-softmmu sh4-softmmu
sparc64-softmmu hexagon-linux-user i386-linux-user s390x-linux-user sparc64-softmmu hexagon-linux-user i386-linux-user s390x-linux-user
MAKE_CHECK_ARGS: check-unit check-qtest SPEED=slow MAKE_CHECK_ARGS: check-unit check-qtest-avr check-qtest-mips64
build-libvhost-user: build-libvhost-user:
extends: .base_job_template extends: .base_job_template