On 09/11/2020 12.04, Philippe Mathieu-Daudé wrote: > On 11/9/20 11:20 AM, Thomas Huth wrote: >> On 08/11/2020 21.45, Philippe Mathieu-Daudé wrote: >>> 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 >> >> Could you please add a MAKE_CHECK_ARGS here, too? check-qtest-rx or >> check-qtest-sh4 sound like good candidates... > > OK. > >> And could you please also use Fedora and/or CentOS for these tests now? >> We're using --without-default-devices in downstream RHEL, so testing with >> that option in Fedora and CentOS would be helpful for us. > > I wanted to do that, but expected someone to object as "we are not > testing the same than before". I'll change one (maybe CentOS 8, which > is less tested than Fedora).
Well, we simply used Ubuntu on Travis since there was no other option. Now we are free to choose. Thus I'd prefer if you could use one Fedora and one CentOS job here now if possible. We've already got some other Ubuntu jobs in the gitlab-CI, so I doubt that anybody will complain. Thomas
