Re: [PULL for 6.1-rc1 00/28] doc, metadata, plugin and testing updates

[Daniel P . Berrangé]

On Sat, Jul 24, 2021 at 11:04:03AM +0100, Peter Maydell wrote:
> On Fri, 23 Jul 2021 at 18:44, Philippe Mathieu-Daudé <philmd@redhat.com> 
> wrote:
> >
> > On 7/23/21 7:03 PM, Alex Bennée wrote:
> > > I realised I'm on holiday next week so I thought I'd better send this now.
> > >
> > > The following changes since commit 
> > > a146af86c8247f41b641783428b95ee71eb0e43f:
> > >
> > >   Merge remote-tracking branch 
> > > 'remotes/kraxel/tags/vga-20210723-pull-request' into staging (2021-07-23 
> > > 12:16:12 +0100)
> > >
> > > are available in the Git repository at:
> > >
> > >   https://github.com/stsquad/qemu.git tags/pull-for-6.1-rc1-230721-1
> > >
> > > for you to fetch changes up to 0a9487d80af9ed6fa14d2696bc34a920b32e53e5:
> > >
> > >   gitlab-ci: Extract OpenSBI job rules to reusable section (2021-07-23 
> > > 17:22:16 +0100)
> > >
> > > ----------------------------------------------------------------
> > > Doc, metadata, plugin and testing updates for 6.1-rc1:
> > >
> > >   - git ignore some file editor detritus
> > >   - add overview on device emulation terminology
> > >   - remove needless if leg in configure custom devices logic
> > >   - numerous gitdm/mailmap updates
> > >   - fix plugin_exit race for linux-user
> > >   - fix a few bugs in cache modelling plugin
> > >   - fix plugin calculation of physical address
> > >   - handle pure assembler/linker tcg tests outside of docker
> > >   - add tricore build to gitlab
> > >   - remove superfluous MacOSX task
> > >   - generalise the OpenBSI gitlab rules
> > >
> > > ----------------------------------------------------------------
> >
> >
> > > Philippe Mathieu-Daudé (1):
> > >       gitlab-ci: Extract OpenSBI job rules to reusable section
> >
> > Oops this isn't to latest version of this patch :/
> >
> > https://lists.gnu.org/archive/html/qemu-devel/2021-07/msg06130.html
> 
> Given Alex is on holiday, should I apply this pullreq anyway and
> then you could send a patch to fix up the differences afterwards,
> or should we drop the pullreq (and maybe this stuff doesn't
> go in for rc1)?

I think it is fine to apply the pullreq anyway.

While there is a bug in the OpenSBI job rules patch, it is still better
than what currently exists in git master. We've also already merged the
identical rules change into the EDK job. So no matter what we'll need
to followup later with more fixes.

The bug in the patch merely means that if the container build fails,
we'll then still try the next build job which will now also possibly
fail.  This is annoying but functionally harmless, as the overall
pipeline will be in a fail state no matter what.


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 :|