qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Peter Maydell <peter.maydell@linaro.org>
To: "Alex Bennée" <alex.bennee@linaro.org>
Cc: QEMU Developers <qemu-devel@nongnu.org>
Subject: Re: [PULL 00/11] rc2 fixes (check-tcg, gitlab, gdbstub)
Date: Thu, 8 Apr 2021 13:00:16 +0000	[thread overview]
Message-ID: <CAFEAcA8eG=jaiT-XntEMEcAjooLP3TNdxYKFtpe9tSQ0rsZ9Fg@mail.gmail.com> (raw)
In-Reply-To: <87a6qauebg.fsf@linaro.org>

On Wed, 7 Apr 2021 at 19:42, Alex Bennée <alex.bennee@linaro.org> wrote:
>
>
> Peter Maydell <peter.maydell@linaro.org> writes:
>
> > On Wed, 7 Apr 2021 at 18:26, Alex Bennée <alex.bennee@linaro.org> wrote:
> >>
> >>
> >> Peter Maydell <peter.maydell@linaro.org> writes:
> >>
> >> > On Tue, 6 Apr 2021 at 16:00, Alex Bennée <alex.bennee@linaro.org> 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 ?
>
> I think either is good, the -2 tag was simply a re-base and has at least
> one clean run before everything went weird.

Yep, it seemed happier on a second run so I've merged this (using the -1
tag; -2 isn't a signed tag).


Applied, thanks.

Please update the changelog at https://wiki.qemu.org/ChangeLog/6.0
for any user-visible changes.

-- PMM


      reply	other threads:[~2021-04-08 13:02 UTC|newest]

Thread overview: 17+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-04-06 15:00 Alex Bennée
2021-04-06 15:00 ` [PULL 01/11] tests/tcg: update the defaults for x86 compilers Alex Bennée
2021-04-06 15:00 ` [PULL 02/11] tests/docker: don't set DOCKER_REGISTRY on non-x86_64 Alex Bennée
2021-04-06 15:00 ` [PULL 03/11] tests/tcg: add concept of container_hosts Alex Bennée
2021-04-06 15:00 ` [PULL 04/11] tests/tcg/configure.sh: make sure we pick up x86_64 cross compilers Alex Bennée
2021-04-06 15:00 ` [PULL 05/11] tests/tcg/i386: expand .data sections for system tests Alex Bennée
2021-04-06 15:00 ` [PULL 06/11] tests/tcg/i386: force -fno-pie for test-i386 Alex Bennée
2021-04-06 15:00 ` [PULL 07/11] tests/tcg: relax the next step precision of the gdb sha1 test Alex Bennée
2021-04-06 15:00 ` [PULL 08/11] docs/system/gdb.rst: Add some more heading structure Alex Bennée
2021-04-06 15:00 ` [PULL 09/11] docs/system/gdb.rst: Document how to debug multicore machines Alex Bennée
2021-04-06 15:00 ` [PULL 10/11] gitlab-ci.yml: Fix the filtering for the git submodules Alex Bennée
2021-04-06 15:00 ` [PULL 11/11] gitlab-ci.yml: Test the dtrace backend in one of the jobs Alex Bennée
2021-04-06 17:37 ` [PULL 00/11] rc2 fixes (check-tcg, gitlab, gdbstub) Peter Maydell
2021-04-07 17:25   ` Alex Bennée
2021-04-07 18:27     ` Peter Maydell
2021-04-07 18:41       ` Alex Bennée
2021-04-08 13:00         ` Peter Maydell [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to='CAFEAcA8eG=jaiT-XntEMEcAjooLP3TNdxYKFtpe9tSQ0rsZ9Fg@mail.gmail.com' \
    --to=peter.maydell@linaro.org \
    --cc=alex.bennee@linaro.org \
    --cc=qemu-devel@nongnu.org \
    --subject='Re: [PULL 00/11] rc2 fixes (check-tcg, gitlab, gdbstub)' \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).