Re: [PATCH v2 2/2] cirrus-ci: Remove MSYS2 jobs duplicated with gitlab-ci

[Daniel P . Berrangé]

On Thu, Mar 23, 2023 at 09:37:40AM +0100, Thomas Huth wrote:
> On 22/03/2023 19.37, Daniel P. Berrangé wrote:
> > On Wed, Mar 22, 2023 at 02:57:21PM +0100, Philippe Mathieu-Daudé wrote:
> ...
> > > diff --git a/.cirrus.yml b/.cirrus.yml
> > > deleted file mode 100644
> > > index 5fb00da73d..0000000000
> > > --- a/.cirrus.yml
> > > +++ /dev/null
> > 
> > > -    MSYS2_PACKAGES: "
> > > -      diffutils git grep make pkg-config sed
> > > -      mingw-w64-x86_64-python
> > > -      mingw-w64-x86_64-python-sphinx
> > 
> > This isn't listed in the .gitlab-ci.d/windows.yml file
> 
> I think that's fine. The gitlab CI Windows jobs are very slow and ran into
> timeout issues in the past already, so we certainly don't want to waste our
> time there with building the documentation.

IMHO, we should have the same deps present in all CI areas. If we
then need to skip docs because of speed lets pass --disable-docs
so that it is explicit that we're skipping them, rather than having
to infer the intention from the missing deps.

My hope would be that we can ultimately make the package listing huere
be auto-generated by lcitool too. It likely only needs a few naming
tweaks here & there for packages to get it working. At that point we
would need to control disablement via  configure flags.

> > > -      mingw-w64-x86_64-toolchain
> > 
> > This also isn't listed
> 
> Seems to be a "group" package:
> 
>  https://packages.msys2.org/groups/mingw-w64-x86_64-toolchain
> 
> It includes other languages like Fortran and Ada ... I think we don't want
> that in the gitlab-CI job.

Ok, yes, better to list exactly what we want.

> 
> > > -      mingw-w64-x86_64-SDL2
> > > -      mingw-w64-x86_64-SDL2_image
> > > -      mingw-w64-x86_64-gtk3
> > > -      mingw-w64-x86_64-glib2
> > > -      mingw-w64-x86_64-ninja
> > > -      mingw-w64-x86_64-jemalloc
> > 
> > This also isn't listed
> 
> I think jemalloc is very niche these days for building QEMU, especially on
> Windows, so I'd rather not use it there.


> > > -      mingw-w64-x86_64-lzo2
> > > -      mingw-w64-x86_64-zstd
> > > -      mingw-w64-x86_64-libjpeg-turbo
> > > -      mingw-w64-x86_64-pixman
> > > -      mingw-w64-x86_64-libgcrypt
> > > -      mingw-w64-x86_64-libpng
> > > -      mingw-w64-x86_64-libssh
> > > -      mingw-w64-x86_64-snappy
> > > -      mingw-w64-x86_64-libusb
> > > -      mingw-w64-x86_64-usbredir
> > > -      mingw-w64-x86_64-libtasn1
> > > -      mingw-w64-x86_64-nettle
> > > -      mingw-w64-x86_64-cyrus-sasl
> > > -      mingw-w64-x86_64-curl
> > > -      mingw-w64-x86_64-gnutls
> > > -      mingw-w64-x86_64-libnfs
> > 
> > The  .gitlab-ci.d/windows.yml file meanwhile adds 'dtc' 'gcc'
> > and 'pkgconf' which are not present here.
> 
> dtc for avoiding to recompile the submodule, gcc and pkgconf as replacement
> for the toolchain group package.

Ok, all makes sense.

> > Broadly I agree with this proposal, but it feels like we might want a
> > few tweak to the windows.yml file to address some of the inconsistencies
> 
> You can have a try, but from my experience, it will be very hard to increase
> the test coverage of those jobs without hitting timeout issues again.
> 
>  Thomas
> 

With regards,
Daniel
-- 
|: https://berrange.com      -o-    https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org         -o-            https://fstop138.berrange.com :|
|: https://entangle-photo.org    -o-    https://www.instagram.com/dberrange :|