From: "Alex Bennée" <alex.bennee@linaro.org>
To: Stefan Hajnoczi <stefanha@gmail.com>
Cc: qemu-devel@nongnu.org
Subject: Re: [PULL v2 0/9] testing updates (back to green!)
Date: Tue, 19 Sep 2023 17:00:09 +0100 [thread overview]
Message-ID: <8734zaw3tb.fsf@linaro.org> (raw)
In-Reply-To: <CAJSP0QUy2e9niaA3uhbyBZm3cw0QW8Wg5u9Cd749VtpZVfXotQ@mail.gmail.com>
Stefan Hajnoczi <stefanha@gmail.com> writes:
> There is some funny business with tests/lcitool/libvirt-ci. Please
> rebase on master and send a v3. Sorry for the trouble, I am afraid I
> would mess something up with the submodule if I attempted to resolve
> it myself.
>
> (If you don't see a conflict when rebasing, please wait until the end
> of the day when the other pull requests queued on the staging branch
> are pushed to master.)
That's weird, was their another PR in flight which touched libvirt-ci?
>
> Thanks!
>
> Auto-merging tests/docker/dockerfiles/debian-amd64-cross.docker
> Auto-merging tests/docker/dockerfiles/debian-amd64.docker
> Auto-merging tests/docker/dockerfiles/debian-arm64-cross.docker
> Auto-merging tests/docker/dockerfiles/debian-armhf-cross.docker
> Auto-merging tests/docker/dockerfiles/debian-ppc64el-cross.docker
> Auto-merging tests/docker/dockerfiles/debian-s390x-cross.docker
> Failed to merge submodule tests/lcitool/libvirt-ci (not checked out)
> CONFLICT (submodule): Merge conflict in tests/lcitool/libvirt-ci
> Recursive merging with submodules currently only supports trivial cases.
> Please manually handle the merging of each conflicted submodule.
> This can be accomplished with the following steps:
> - come back to superproject and run:
>
> git add tests/lcitool/libvirt-ci
>
> to record the above merge or update
> - resolve any other conflicts in the superproject
> - commit the resulting index in the superproject
> Automatic merge failed; fix conflicts and then commit the result.
>
> Stefan
>
> On Tue, 19 Sept 2023 at 02:59, Alex Bennée <alex.bennee@linaro.org> wrote:
>>
>> The following changes since commit 13d6b1608160de40ec65ae4c32419e56714bbadf:
>>
>> Merge tag 'pull-crypto-20230915' of https://gitlab.com/rth7680/qemu into staging (2023-09-18 11:04:21 -0400)
>>
>> are available in the Git repository at:
>>
>> https://gitlab.com/stsquad/qemu.git tags/pull-maintainer-ominbus-190923-1
>>
>> for you to fetch changes up to bb3c01212b54595f5bbdbe235cb353b220f94943:
>>
>> tests/avocado: Disable MIPS Malta tests due to GitLab issue #1884 (2023-09-19 07:46:02 +0100)
>>
>> ----------------------------------------------------------------
>> testing updates:
>>
>> - update most Debian to bookworm
>> - fix some typos
>> - update loongarch toolchain
>> - fix microbit test
>> - handle GitLab/Cirrus timeout discrepancy
>> - improve avocado console handling
>> - disable mips avocado images pending bugfix
>>
>> ----------------------------------------------------------------
>> Alex Bennée (2):
>> tests: update most Debian images to Bookworm
>> gitlab: fix typo/spelling in comments
>>
>> Daniel P. Berrangé (4):
>> microbit: add missing qtest_quit() call
>> qtest: kill orphaned qtest QEMU processes on FreeBSD
>> gitlab: make Cirrus CI timeout explicit
>> gitlab: make Cirrus CI jobs gating
>>
>> Nicholas Piggin (1):
>> tests/avocado: Fix console data loss
>>
>> Philippe Mathieu-Daudé (1):
>> tests/avocado: Disable MIPS Malta tests due to GitLab issue #1884
>>
>> Richard Henderson (1):
>> tests/docker: Update docker-loongarch-cross toolchain
>>
>> tests/qtest/libqtest.c | 7 +++++++
>> tests/qtest/microbit-test.c | 2 ++
>> .gitlab-ci.d/base.yml | 2 +-
>> .gitlab-ci.d/cirrus.yml | 4 +++-
>> .gitlab-ci.d/cirrus/build.yml | 2 ++
>> python/qemu/machine/machine.py | 19 +++++++++++++++++++
>> tests/avocado/avocado_qemu/__init__.py | 2 +-
>> tests/avocado/boot_linux_console.py | 7 +++++++
>> tests/avocado/machine_mips_malta.py | 6 ++++++
>> tests/avocado/replay_kernel.py | 7 +++++++
>> tests/avocado/tuxrun_baselines.py | 4 ++++
>> tests/docker/dockerfiles/debian-amd64-cross.docker | 10 +++-------
>> tests/docker/dockerfiles/debian-amd64.docker | 10 +++-------
>> tests/docker/dockerfiles/debian-arm64-cross.docker | 10 +++-------
>> tests/docker/dockerfiles/debian-armel-cross.docker | 2 +-
>> tests/docker/dockerfiles/debian-armhf-cross.docker | 10 +++-------
>> .../docker/dockerfiles/debian-loongarch-cross.docker | 2 +-
>> tests/docker/dockerfiles/debian-ppc64el-cross.docker | 10 +++-------
>> tests/docker/dockerfiles/debian-s390x-cross.docker | 10 +++-------
>> tests/docker/dockerfiles/ubuntu2004.docker | 2 +-
>> tests/docker/dockerfiles/ubuntu2204.docker | 2 +-
>> tests/lcitool/libvirt-ci | 2 +-
>> tests/lcitool/refresh | 17 +++++++++--------
>> 23 files changed, 91 insertions(+), 58 deletions(-)
>>
>> --
>> 2.39.2
>>
>>
--
Alex Bennée
Virtualisation Tech Lead @ Linaro
next prev parent reply other threads:[~2023-09-19 16:03 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-09-19 6:57 [PULL v2 0/9] testing updates (back to green!) Alex Bennée
2023-09-19 15:28 ` Stefan Hajnoczi
2023-09-19 16:00 ` Alex Bennée [this message]
2023-09-19 16:14 ` Stefan Hajnoczi
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=8734zaw3tb.fsf@linaro.org \
--to=alex.bennee@linaro.org \
--cc=qemu-devel@nongnu.org \
--cc=stefanha@gmail.com \
/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
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).