On Wed, 7 Apr 2021 at 18:26, Alex Bennée <[email protected]> wrote: > > > Peter Maydell <[email protected]> writes: > > > On Tue, 6 Apr 2021 at 16:00, Alex Bennée <[email protected]> wrote: > >> > >> The following changes since commit > >> 109918d24a3bb9ed3d05beb34ea4ac6be443c138: > >> > >> Merge remote-tracking branch > >> 'remotes/nvme/tags/nvme-fixes-for-6.0-pull-request' into staging > >> (2021-04-05 22:15:38 +0100) > >> > >> are available in the Git repository at: > >> > >> https://github.com/stsquad/qemu.git tags/pull-6.0-rc2-fixes-060421-1 > >> > >> for you to fetch changes up to a2e5bbf0c407a572d9b687adaecf9995f66b4cd9: > >> > >> gitlab-ci.yml: Test the dtrace backend in one of the jobs (2021-04-06 > >> 15:04:50 +0100) > >> > >> ---------------------------------------------------------------- > >> Testing updates: > >> > >> - fix x86_64 cross compilers > >> - don't use registry for non-x86 containers > >> - add valid host types for given cross compile containers > >> - clean up i386 code16 test with explicit -no-pie > >> - relax sha1.py gdbstub test > >> - add more gdbstub documentation > >> - remove annoying warning on gitlab > >> - test dtrace backend in gitlab > >> > >> ---------------------------------------------------------------- > > > > The merge for this failed in gitlab CI with a weird state: > > > > https://gitlab.com/qemu-project/qemu/-/pipelines/282228325 > > > > * marked "failed" > > * but has a "cancel" button > > * has no "retry" button > > * has an "error" tag whose hover-over text reads "Pipeline job activity > > limit exceeded!" > > > > Not being sure whether this is gitlab CI being flaky again or a problem > > with something in the pullreq, I've not applied it for rc2; we can > > figure out what happened and maybe try again for rc3. > > I think it's GitLab going nuts because: > > https://gitlab.com/stsquad/qemu/-/pipelines/282304522 is all green > https://gitlab.com/stsquad/qemu/-/pipelines/282619235 is a dumpster fire > > And they are both the same commit (pull-6.0-rc2-fixes-070421-2)
Should I retry a merge of this pullreq (which is -1), or are you going to submit a new one ? thanks -- PMM
