Similarly to commit 8cdb2cef3f1, move the job testing the '--without-default-devices' configure option to GitLab.
Since building all softmmu targets takes too long, split the job in 2. As smoke test, run the qtests on the AVR and m68k targets. Signed-off-by: Philippe Mathieu-Daudé <phi...@redhat.com> --- Cc: Paolo Bonzini <pbonz...@redhat.com> v3 had: Reviewed-by: Thomas Huth <th...@redhat.com> Reviewed-by: Wainer dos Santos Moschetta <waine...@redhat.com> --- .gitlab-ci.yml | 46 ++++++++++++++++++++++++++++++++++++++++++++++ .travis.yml | 8 -------- 2 files changed, 46 insertions(+), 8 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b98800462ed..3fc3d0568c6 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -315,6 +315,52 @@ build-user-plugins: MAKE_CHECK_ARGS: check-tcg timeout: 1h 30m +build-system-ubuntu-without-default-devices 1/2: + <<: *native_build_job_definition + variables: + IMAGE: ubuntu2004 + CONFIGURE_ARGS: --without-default-devices --disable-tools --disable-docs + TARGETS: + aarch64-softmmu + alpha-softmmu + arm-softmmu + avr-softmmu + cris-softmmu + hppa-softmmu + i386-softmmu + m68k-softmmu + microblazeel-softmmu + microblaze-softmmu + mips64el-softmmu + mips64-softmmu + mipsel-softmmu + mips-softmmu + moxie-softmmu + MAKE_CHECK_ARGS: check-qtest-avr check-qtest-m68k + +build-system-ubuntu-without-default-devices 2/2: + <<: *native_build_job_definition + variables: + IMAGE: ubuntu2004 + CONFIGURE_ARGS: --without-default-devices --disable-tools --disable-docs + TARGETS: + nios2-softmmu + or1k-softmmu + ppc64-softmmu + ppc-softmmu + riscv32-softmmu + riscv64-softmmu + rx-softmmu + s390x-softmmu + sh4eb-softmmu + sh4-softmmu + sparc64-softmmu + sparc-softmmu + tricore-softmmu + x86_64-softmmu + xtensaeb-softmmu + xtensa-softmmu + build-clang: <<: *native_build_job_definition variables: diff --git a/.travis.yml b/.travis.yml index a3d78171cab..15d92291358 100644 --- a/.travis.yml +++ b/.travis.yml @@ -224,14 +224,6 @@ jobs: - ${SRC_DIR}/scripts/travis/coverage-summary.sh - # We manually include builds which we disable "make check" for - - name: "GCC without-default-devices (softmmu)" - env: - - CONFIG="--without-default-devices --disable-user" - - CACHE_NAME="${TRAVIS_BRANCH}-linux-gcc-default" - - TEST_CMD="" - - # We don't need to exercise every backend with every front-end - name: "GCC trace log,simple,syslog (user)" env: -- 2.26.2