Re: [PATCH 6/6] gitlab-ci.d/buildtest: Disintegrate the build-coroutine-sigaltstack job

[Thomas Huth]

On 30/01/2023 11.58, Daniel P. Berrangé wrote:
> On Mon, Jan 30, 2023 at 11:44:46AM +0100, Thomas Huth wrote:
> > We can get rid of the build-coroutine-sigaltstack job by moving
> > the configure flags that should be tested here to other jobs:
> > Move --with-coroutine=sigaltstack to the build-without-defaults job
> > and --enable-trace-backends=ftrace to the cross-s390x-kvm-only job.
>
> The biggest user of coroutines is the block layer. So we probably
> ought to have coroutines aligned with a job that triggers the
> 'make check-block' for iotests.  IIUC,  the without-defaults
> job won't do that. How about, arbitrarily, using either the
> 'check-system-debian' or 'check-system-ubuntu' job. Those distros
> are closely related, so getting sigaltstack vs ucontext coverage
> between them is a good win, and they both trigger the block jobs
> IIUC.

Ok ... but let's put qemu-block@nongnu.org on CC: first, to see what the 
block layer folks think about this.

> Incidentally sigaltstack is also covered by our Cirrus CI job
> for macOS.

Oh, nice, so we already have some "check-block" test coverage there!

 Thomas


> > ---
> >   .gitlab-ci.d/buildtest.yml   | 14 ++------------
> >   .gitlab-ci.d/crossbuilds.yml |  2 +-
> >   2 files changed, 3 insertions(+), 13 deletions(-)
> >
> > diff --git a/.gitlab-ci.d/buildtest.yml b/.gitlab-ci.d/buildtest.yml
> > index 91c7467a66..1438797a1c 100644
> > --- a/.gitlab-ci.d/buildtest.yml
> > +++ b/.gitlab-ci.d/buildtest.yml
> > @@ -533,19 +533,8 @@ build-tci:
> >       - QTEST_QEMU_BINARY="./qemu-system-s390x" ./tests/qtest/pxe-test -m slow
> >       - make check-tcg
> >   
> > -# Alternate coroutines implementations are only really of interest to KVM users
> > -# However we can't test against KVM on Gitlab-CI so we can only run unit tests
> > -build-coroutine-sigaltstack:
> > -  extends: .native_build_job_template
> > -  needs:
> > -    job: amd64-ubuntu2004-container
> > -  variables:
> > -    IMAGE: ubuntu2004
> > -    CONFIGURE_ARGS: --with-coroutine=sigaltstack --disable-tcg
> > -                    --enable-trace-backends=ftrace
> > -    MAKE_CHECK_ARGS: check-unit
> > -
> >   # Check our reduced build configurations
> > +# (and an alternative coroutine implementation)
> >   build-without-defaults:
> >     extends: .native_build_job_template
> >     needs:
> > @@ -559,6 +548,7 @@ build-without-defaults:
> >         --disable-pie
> >         --disable-qom-cast-debug
> >         --disable-strip
> > +      --with-coroutine=sigaltstack
> >       TARGETS: avr-softmmu mips64-softmmu s390x-softmmu sh4-softmmu
> >         sparc64-softmmu hexagon-linux-user i386-linux-user s390x-linux-user
> >       MAKE_CHECK_ARGS: check-unit check-qtest-avr check-qtest-mips64
> > diff --git a/.gitlab-ci.d/crossbuilds.yml b/.gitlab-ci.d/crossbuilds.yml
> > index 8dbbb8f881..027d2088da 100644
> > --- a/.gitlab-ci.d/crossbuilds.yml
> > +++ b/.gitlab-ci.d/crossbuilds.yml
> > @@ -159,7 +159,7 @@ cross-s390x-kvm-only:
> >       job: s390x-debian-cross-container
> >     variables:
> >       IMAGE: debian-s390x-cross
> > -    EXTRA_CONFIGURE_OPTS: --disable-tcg
> > +    EXTRA_CONFIGURE_OPTS: --disable-tcg --enable-trace-backends=ftrace
> >   
> >   cross-mips64el-kvm-only:
> >     extends: .cross_accel_build_job
> > --
> > 2.31.1
>
> With regards,
> Daniel