1. Patchew
  2. QEMU
  3. View series

[PULL 00/17] CI job updates, header cleanups and other misc patches

Thomas Huth posted 17 patches 1 week, 3 days ago
Patches applied successfully (tree, apply log)
git fetch https://github.com/patchew-project/qemu tags/patchew/20240424075735.248041-1-thuth@redhat.com
Maintainers: "Alex Bennée" <alex.bennee@linaro.org>, "Philippe Mathieu-Daudé" <philmd@linaro.org>, Thomas Huth <thuth@redhat.com>, Wainer dos Santos Moschetta <wainersm@redhat.com>, Beraldo Leal <bleal@redhat.com>, "Daniel P. Berrangé" <berrange@redhat.com>, Markus Armbruster <armbru@redhat.com>, Paolo Bonzini <pbonzini@redhat.com>, Halil Pasic <pasic@linux.ibm.com>, Christian Borntraeger <borntraeger@linux.ibm.com>, Eric Farman <farman@linux.ibm.com>, Richard Henderson <richard.henderson@linaro.org>, David Hildenbrand <david@redhat.com>, Ilya Leoshkevich <iii@linux.ibm.com>, "Cédric Le Goater" <clg@kaod.org>, Peter Maydell <peter.maydell@linaro.org>, Andrew Jeffery <andrew@codeconstruct.com.au>, Joel Stanley <joel@jms.id.au>, Ninad Palsule <ninad@linux.ibm.com>, Laurent Vivier <lvivier@redhat.com>, John Snow <jsnow@redhat.com>, Warner Losh <imp@bsdimp.com>, Kyle Evans <kevans@freebsd.org>
There is a newer version of this series
MAINTAINERS                                        |   6 +-
docs/devel/submitting-a-patch.rst                  |   2 +-
docs/system/target-i386-desc.rst.inc               |   2 +-
hw/s390x/s390-virtio-hcall.h                       |   2 +
target/s390x/cpu_models.h                          |  15 --
hw/s390x/s390-stattrib.c                           |   1 +
tests/qtest/aspeed_fsi-test.c                      |  20 +--
tests/qtest/cmsdk-apb-dualtimer-test.c             |   2 +-
tests/qtest/cmsdk-apb-watchdog-test.c              |   2 +-
tests/qtest/erst-test.c                            |   2 +-
tests/qtest/ivshmem-test.c                         |  10 +-
tests/qtest/libqos/ahci.c                          |   4 +-
tests/qtest/microbit-test.c                        |  46 +++---
tests/qtest/sse-timer-test.c                       |   4 +-
tests/qtest/stm32l4x5_exti-test.c                  | 138 +++++++++---------
tests/qtest/stm32l4x5_syscfg-test.c                |  74 +++++-----
tests/unit/test-nested-aio-poll.c                  |   7 -
.gitlab-ci.d/buildtest.yml                         |  16 +--
.gitlab-ci.d/container-core.yml                    |   4 +-
.travis.yml                                        |  24 +---
.../stream/{8 => 9}/build-environment.yml          |  31 ++--
.../ci/org.centos/stream/{8 => 9}/x86_64/configure |   4 +-
.../org.centos/stream/{8 => 9}/x86_64/test-avocado |   0
scripts/ci/setup/build-environment.yml             |  44 +++---
tests/docker/dockerfiles/alpine.docker             |   3 +-
.../dockerfiles/{centos8.docker => centos9.docker} |  35 ++---
tests/docker/dockerfiles/debian-amd64-cross.docker |   3 +-
tests/docker/dockerfiles/debian-arm64-cross.docker |   3 +-
tests/docker/dockerfiles/debian-armel-cross.docker |   3 +-
tests/docker/dockerfiles/debian-armhf-cross.docker |   3 +-
tests/docker/dockerfiles/debian-i686-cross.docker  |   3 +-
.../dockerfiles/debian-mips64el-cross.docker       |   3 +-
.../docker/dockerfiles/debian-mipsel-cross.docker  |   3 +-
.../docker/dockerfiles/debian-ppc64el-cross.docker |   3 +-
.../docker/dockerfiles/debian-riscv64-cross.docker |   3 +-
tests/docker/dockerfiles/debian-s390x-cross.docker |   3 +-
tests/docker/dockerfiles/debian.docker             |   1 +
tests/docker/dockerfiles/fedora-win64-cross.docker |   3 +-
tests/docker/dockerfiles/fedora.docker             |   1 +
tests/docker/dockerfiles/opensuse-leap.docker      |   1 +
tests/docker/dockerfiles/ubuntu2004.docker         | 157 ---------------------
tests/docker/dockerfiles/ubuntu2204.docker         |   1 +
tests/lcitool/libvirt-ci                           |   2 +-
tests/lcitool/mappings.yml                         |  20 ---
tests/lcitool/refresh                              |   3 +-
tests/vm/centos                                    |   4 +-
tests/vm/openbsd                                   |   6 +-
47 files changed, 259 insertions(+), 468 deletions(-)
rename scripts/ci/org.centos/stream/{8 => 9}/build-environment.yml (75%)
rename scripts/ci/org.centos/stream/{8 => 9}/x86_64/configure (98%)
rename scripts/ci/org.centos/stream/{8 => 9}/x86_64/test-avocado (100%)
rename tests/docker/dockerfiles/{centos8.docker => centos9.docker} (82%)
delete mode 100644 tests/docker/dockerfiles/ubuntu2004.docker
[PULL 00/17] CI job updates, header cleanups and other misc patches
Posted by Thomas Huth 1 week, 3 days ago 
The following changes since commit 13b1e9667737132440f4d500c31cb69320c6b15a:

  Merge tag 'for-upstream' of https://gitlab.com/bonzini/qemu into staging (2024-04-23 17:35:57 -0700)

are available in the Git repository at:

  https://gitlab.com/thuth/qemu.git tags/pull-request-2024-04-24

for you to fetch changes up to 8f29bab03ea22694a127ee33edeb4ce99eeb124e:

  target/s390x: Remove KVM stubs in cpu_models.h (2024-04-24 09:45:02 +0200)

----------------------------------------------------------------
* Update OpenBSD CI image to 7.5
* Update/remove Ubuntu 20.04 CI jobs
* Update CentOS 8 CI jobs to CentOS 9
* Some clean-ups and improvements to travis.yml
* Minor test fixes
* s390x header clean-ups
* Doc updates

----------------------------------------------------------------
Brad Smith (1):
      tests/vm: update openbsd image to 7.5

Inès Varhol (1):
      tests/qtest : Use `g_assert_cmphex` instead of `g_assert_cmpuint`

Manos Pitsidianakis (1):
      docs/devel: fix minor typo in submitting-a-patch.rst

Paolo Bonzini (1):
      ci: move external build environment setups to CentOS Stream 9

Peter Lieven (1):
      MAINTAINERS: update email of Peter Lieven

Philippe Mathieu-Daudé (3):
      hw/s390x: Include missing 'cpu.h' header
      tests/unit: Remove debug statements in test-nested-aio-poll.c
      target/s390x: Remove KVM stubs in cpu_models.h

Thomas Huth (8):
      Revert ".travis.yml: Cache Avocado cache"
      .travis.yml: Remove the unused UNRELIABLE environment variable
      .travis.yml: Update the jobs to Ubuntu 22.04
      .travis.yml: Do some more testing with Clang
      tests: Remove Ubuntu 20.04 container
      tests/lcitool/libvirt-ci: Update to the latest master branch
      tests/docker/dockerfiles: Run lcitool-refresh after the lcitool update
      tests: Update our CI to use CentOS Stream 9 instead of 8

Zhao Liu (1):
      docs: i386: pc: Update maximum CPU numbers for PC Q35

 MAINTAINERS                                        |   6 +-
 docs/devel/submitting-a-patch.rst                  |   2 +-
 docs/system/target-i386-desc.rst.inc               |   2 +-
 hw/s390x/s390-virtio-hcall.h                       |   2 +
 target/s390x/cpu_models.h                          |  15 --
 hw/s390x/s390-stattrib.c                           |   1 +
 tests/qtest/aspeed_fsi-test.c                      |  20 +--
 tests/qtest/cmsdk-apb-dualtimer-test.c             |   2 +-
 tests/qtest/cmsdk-apb-watchdog-test.c              |   2 +-
 tests/qtest/erst-test.c                            |   2 +-
 tests/qtest/ivshmem-test.c                         |  10 +-
 tests/qtest/libqos/ahci.c                          |   4 +-
 tests/qtest/microbit-test.c                        |  46 +++---
 tests/qtest/sse-timer-test.c                       |   4 +-
 tests/qtest/stm32l4x5_exti-test.c                  | 138 +++++++++---------
 tests/qtest/stm32l4x5_syscfg-test.c                |  74 +++++-----
 tests/unit/test-nested-aio-poll.c                  |   7 -
 .gitlab-ci.d/buildtest.yml                         |  16 +--
 .gitlab-ci.d/container-core.yml                    |   4 +-
 .travis.yml                                        |  24 +---
 .../stream/{8 => 9}/build-environment.yml          |  31 ++--
 .../ci/org.centos/stream/{8 => 9}/x86_64/configure |   4 +-
 .../org.centos/stream/{8 => 9}/x86_64/test-avocado |   0
 scripts/ci/setup/build-environment.yml             |  44 +++---
 tests/docker/dockerfiles/alpine.docker             |   3 +-
 .../dockerfiles/{centos8.docker => centos9.docker} |  35 ++---
 tests/docker/dockerfiles/debian-amd64-cross.docker |   3 +-
 tests/docker/dockerfiles/debian-arm64-cross.docker |   3 +-
 tests/docker/dockerfiles/debian-armel-cross.docker |   3 +-
 tests/docker/dockerfiles/debian-armhf-cross.docker |   3 +-
 tests/docker/dockerfiles/debian-i686-cross.docker  |   3 +-
 .../dockerfiles/debian-mips64el-cross.docker       |   3 +-
 .../docker/dockerfiles/debian-mipsel-cross.docker  |   3 +-
 .../docker/dockerfiles/debian-ppc64el-cross.docker |   3 +-
 .../docker/dockerfiles/debian-riscv64-cross.docker |   3 +-
 tests/docker/dockerfiles/debian-s390x-cross.docker |   3 +-
 tests/docker/dockerfiles/debian.docker             |   1 +
 tests/docker/dockerfiles/fedora-win64-cross.docker |   3 +-
 tests/docker/dockerfiles/fedora.docker             |   1 +
 tests/docker/dockerfiles/opensuse-leap.docker      |   1 +
 tests/docker/dockerfiles/ubuntu2004.docker         | 157 ---------------------
 tests/docker/dockerfiles/ubuntu2204.docker         |   1 +
 tests/lcitool/libvirt-ci                           |   2 +-
 tests/lcitool/mappings.yml                         |  20 ---
 tests/lcitool/refresh                              |   3 +-
 tests/vm/centos                                    |   4 +-
 tests/vm/openbsd                                   |   6 +-
 47 files changed, 259 insertions(+), 468 deletions(-)
 rename scripts/ci/org.centos/stream/{8 => 9}/build-environment.yml (75%)
 rename scripts/ci/org.centos/stream/{8 => 9}/x86_64/configure (98%)
 rename scripts/ci/org.centos/stream/{8 => 9}/x86_64/test-avocado (100%)
 rename tests/docker/dockerfiles/{centos8.docker => centos9.docker} (82%)
 delete mode 100644 tests/docker/dockerfiles/ubuntu2004.docker
Re: [PULL 00/17] CI job updates, header cleanups and other misc patches
Posted by Richard Henderson 1 week, 3 days ago 
On 4/24/24 00:57, Thomas Huth wrote:
> The following changes since commit 13b1e9667737132440f4d500c31cb69320c6b15a:
> 
>    Merge tag 'for-upstream' of https://gitlab.com/bonzini/qemu into staging (2024-04-23 17:35:57 -0700)
> 
> are available in the Git repository at:
> 
>    https://gitlab.com/thuth/qemu.git tags/pull-request-2024-04-24
> 
> for you to fetch changes up to 8f29bab03ea22694a127ee33edeb4ce99eeb124e:
> 
>    target/s390x: Remove KVM stubs in cpu_models.h (2024-04-24 09:45:02 +0200)
> 
> ----------------------------------------------------------------
> * Update OpenBSD CI image to 7.5
> * Update/remove Ubuntu 20.04 CI jobs
> * Update CentOS 8 CI jobs to CentOS 9
> * Some clean-ups and improvements to travis.yml
> * Minor test fixes
> * s390x header clean-ups
> * Doc updates

This introduces a failure in the migration-compat-x86_64 job:

https://gitlab.com/qemu-project/qemu/-/jobs/6707154868


r~
Re: [PULL 00/17] CI job updates, header cleanups and other misc patches
Posted by Thomas Huth 1 week, 2 days ago 
On 24/04/2024 18.21, Richard Henderson wrote:
> On 4/24/24 00:57, Thomas Huth wrote:
>> The following changes since commit 13b1e9667737132440f4d500c31cb69320c6b15a:
>>
>>    Merge tag 'for-upstream' of https://gitlab.com/bonzini/qemu into 
>> staging (2024-04-23 17:35:57 -0700)
>>
>> are available in the Git repository at:
>>
>>    https://gitlab.com/thuth/qemu.git tags/pull-request-2024-04-24
>>
>> for you to fetch changes up to 8f29bab03ea22694a127ee33edeb4ce99eeb124e:
>>
>>    target/s390x: Remove KVM stubs in cpu_models.h (2024-04-24 09:45:02 +0200)
>>
>> ----------------------------------------------------------------
>> * Update OpenBSD CI image to 7.5
>> * Update/remove Ubuntu 20.04 CI jobs
>> * Update CentOS 8 CI jobs to CentOS 9
>> * Some clean-ups and improvements to travis.yml
>> * Minor test fixes
>> * s390x header clean-ups
>> * Doc updates
> 
> This introduces a failure in the migration-compat-x86_64 job:
> 
> https://gitlab.com/qemu-project/qemu/-/jobs/6707154868

It wasn't failing for me:

  https://gitlab.com/thuth/qemu/-/jobs/6702058896

And according to the diffstat of my pull request, it's only touching test 
files, docs, and s390x stuff, so I somehow fail to see how it could 
influence x86 migration at a first glance. It also looks like the job is 
running on opensuse, and not on CentOS or Ubuntu, so it should likely not be 
influenced by the changes in this PR.

Could you please hit the re-run button of that job? If it then passes, we're 
likely rather facing an intermitted failure that might have been introduced 
earlier already...

  Thanks,
   Thomas
Re: [PULL 00/17] CI job updates, header cleanups and other misc patches
Posted by Richard Henderson 1 week, 2 days ago 
On 4/24/24 22:11, Thomas Huth wrote:
> On 24/04/2024 18.21, Richard Henderson wrote:
>> On 4/24/24 00:57, Thomas Huth wrote:
>>> The following changes since commit 13b1e9667737132440f4d500c31cb69320c6b15a:
>>>
>>>    Merge tag 'for-upstream' of https://gitlab.com/bonzini/qemu into staging (2024-04-23 
>>> 17:35:57 -0700)
>>>
>>> are available in the Git repository at:
>>>
>>>    https://gitlab.com/thuth/qemu.git tags/pull-request-2024-04-24
>>>
>>> for you to fetch changes up to 8f29bab03ea22694a127ee33edeb4ce99eeb124e:
>>>
>>>    target/s390x: Remove KVM stubs in cpu_models.h (2024-04-24 09:45:02 +0200)
>>>
>>> ----------------------------------------------------------------
>>> * Update OpenBSD CI image to 7.5
>>> * Update/remove Ubuntu 20.04 CI jobs
>>> * Update CentOS 8 CI jobs to CentOS 9
>>> * Some clean-ups and improvements to travis.yml
>>> * Minor test fixes
>>> * s390x header clean-ups
>>> * Doc updates
>>
>> This introduces a failure in the migration-compat-x86_64 job:
>>
>> https://gitlab.com/qemu-project/qemu/-/jobs/6707154868
> 
> It wasn't failing for me:
> 
>   https://gitlab.com/thuth/qemu/-/jobs/6702058896
> 
> And according to the diffstat of my pull request, it's only touching test files, docs, and 
> s390x stuff, so I somehow fail to see how it could influence x86 migration at a first 
> glance. It also looks like the job is running on opensuse, and not on CentOS or Ubuntu, so 
> it should likely not be influenced by the changes in this PR.
> 
> Could you please hit the re-run button of that job? If it then passes, we're likely rather 
> facing an intermitted failure that might have been introduced earlier already...

It did pass when re-run.


r~
Re: [PULL 00/17] CI job updates, header cleanups and other misc patches
Posted by Thomas Huth 1 week, 2 days ago 
On 25/04/2024 17.04, Richard Henderson wrote:
> On 4/24/24 22:11, Thomas Huth wrote:
>> On 24/04/2024 18.21, Richard Henderson wrote:
>>> On 4/24/24 00:57, Thomas Huth wrote:
>>>> The following changes since commit 
>>>> 13b1e9667737132440f4d500c31cb69320c6b15a:
>>>>
>>>>    Merge tag 'for-upstream' of https://gitlab.com/bonzini/qemu into 
>>>> staging (2024-04-23 17:35:57 -0700)
>>>>
>>>> are available in the Git repository at:
>>>>
>>>>    https://gitlab.com/thuth/qemu.git tags/pull-request-2024-04-24
>>>>
>>>> for you to fetch changes up to 8f29bab03ea22694a127ee33edeb4ce99eeb124e:
>>>>
>>>>    target/s390x: Remove KVM stubs in cpu_models.h (2024-04-24 09:45:02 
>>>> +0200)
>>>>
>>>> ----------------------------------------------------------------
>>>> * Update OpenBSD CI image to 7.5
>>>> * Update/remove Ubuntu 20.04 CI jobs
>>>> * Update CentOS 8 CI jobs to CentOS 9
>>>> * Some clean-ups and improvements to travis.yml
>>>> * Minor test fixes
>>>> * s390x header clean-ups
>>>> * Doc updates
>>>
>>> This introduces a failure in the migration-compat-x86_64 job:
>>>
>>> https://gitlab.com/qemu-project/qemu/-/jobs/6707154868
>>
>> It wasn't failing for me:
>>
>>   https://gitlab.com/thuth/qemu/-/jobs/6702058896
>>
>> And according to the diffstat of my pull request, it's only touching test 
>> files, docs, and s390x stuff, so I somehow fail to see how it could 
>> influence x86 migration at a first glance. It also looks like the job is 
>> running on opensuse, and not on CentOS or Ubuntu, so it should likely not 
>> be influenced by the changes in this PR.
>>
>> Could you please hit the re-run button of that job? If it then passes, 
>> we're likely rather facing an intermitted failure that might have been 
>> introduced earlier already...
> 
> It did pass when re-run.

Ok, thanks! So it's likely and intermitted problem indeed...

I've now submitted a v2 of the pull request where I just dropped the other 
problematic patch that tried to update the custom CentOS runner ... I hope 
that PR should be fine now.

  Thomas
Re: [PULL 00/17] CI job updates, header cleanups and other misc patches
Posted by Daniel P. Berrangé 1 week, 2 days ago 
On Thu, Apr 25, 2024 at 07:11:41AM +0200, Thomas Huth wrote:
> On 24/04/2024 18.21, Richard Henderson wrote:
> > On 4/24/24 00:57, Thomas Huth wrote:
> > > The following changes since commit 13b1e9667737132440f4d500c31cb69320c6b15a:
> > > 
> > >    Merge tag 'for-upstream' of https://gitlab.com/bonzini/qemu into
> > > staging (2024-04-23 17:35:57 -0700)
> > > 
> > > are available in the Git repository at:
> > > 
> > >    https://gitlab.com/thuth/qemu.git tags/pull-request-2024-04-24
> > > 
> > > for you to fetch changes up to 8f29bab03ea22694a127ee33edeb4ce99eeb124e:
> > > 
> > >    target/s390x: Remove KVM stubs in cpu_models.h (2024-04-24 09:45:02 +0200)
> > > 
> > > ----------------------------------------------------------------
> > > * Update OpenBSD CI image to 7.5
> > > * Update/remove Ubuntu 20.04 CI jobs
> > > * Update CentOS 8 CI jobs to CentOS 9
> > > * Some clean-ups and improvements to travis.yml
> > > * Minor test fixes
> > > * s390x header clean-ups
> > > * Doc updates
> > 
> > This introduces a failure in the migration-compat-x86_64 job:
> > 
> > https://gitlab.com/qemu-project/qemu/-/jobs/6707154868
> 
> It wasn't failing for me:
> 
>  https://gitlab.com/thuth/qemu/-/jobs/6702058896
> 
> And according to the diffstat of my pull request, it's only touching test
> files, docs, and s390x stuff, so I somehow fail to see how it could
> influence x86 migration at a first glance. It also looks like the job is
> running on opensuse, and not on CentOS or Ubuntu, so it should likely not be
> influenced by the changes in this PR.
> 
> Could you please hit the re-run button of that job? If it then passes, we're
> likely rather facing an intermitted failure that might have been introduced
> earlier already...

The specific job that's failiing is the multifd cancellation test.
This is exactly the kind of functional area of migration where
non-deterministic failures are likely to appear. So one for the
migration maintainers to look at most likely.


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 :|
Re: [PULL 00/17] CI job updates, header cleanups and other misc patches
Posted by Fabiano Rosas 1 week, 2 days ago 
Daniel P. Berrangé <berrange@redhat.com> writes:

> On Thu, Apr 25, 2024 at 07:11:41AM +0200, Thomas Huth wrote:
>> On 24/04/2024 18.21, Richard Henderson wrote:
>> > On 4/24/24 00:57, Thomas Huth wrote:
>> > > The following changes since commit 13b1e9667737132440f4d500c31cb69320c6b15a:
>> > > 
>> > >    Merge tag 'for-upstream' of https://gitlab.com/bonzini/qemu into
>> > > staging (2024-04-23 17:35:57 -0700)
>> > > 
>> > > are available in the Git repository at:
>> > > 
>> > >    https://gitlab.com/thuth/qemu.git tags/pull-request-2024-04-24
>> > > 
>> > > for you to fetch changes up to 8f29bab03ea22694a127ee33edeb4ce99eeb124e:
>> > > 
>> > >    target/s390x: Remove KVM stubs in cpu_models.h (2024-04-24 09:45:02 +0200)
>> > > 
>> > > ----------------------------------------------------------------
>> > > * Update OpenBSD CI image to 7.5
>> > > * Update/remove Ubuntu 20.04 CI jobs
>> > > * Update CentOS 8 CI jobs to CentOS 9
>> > > * Some clean-ups and improvements to travis.yml
>> > > * Minor test fixes
>> > > * s390x header clean-ups
>> > > * Doc updates
>> > 
>> > This introduces a failure in the migration-compat-x86_64 job:
>> > 
>> > https://gitlab.com/qemu-project/qemu/-/jobs/6707154868
>> 
>> It wasn't failing for me:
>> 
>>  https://gitlab.com/thuth/qemu/-/jobs/6702058896
>> 
>> And according to the diffstat of my pull request, it's only touching test
>> files, docs, and s390x stuff, so I somehow fail to see how it could
>> influence x86 migration at a first glance. It also looks like the job is
>> running on opensuse, and not on CentOS or Ubuntu, so it should likely not be
>> influenced by the changes in this PR.
>> 
>> Could you please hit the re-run button of that job? If it then passes, we're
>> likely rather facing an intermitted failure that might have been introduced
>> earlier already...
>
> The specific job that's failiing is the multifd cancellation test.
> This is exactly the kind of functional area of migration where
> non-deterministic failures are likely to appear. So one for the
> migration maintainers to look at most likely.
>

Yes, that's the test that catches any race conditions on
error/cleanup. I agree that the PR here doesn't seem to interact with
any of that. The previous PR from Peter Xu has code that changes error
paths, so it's more likely to be it. The recent changes to the migration
tests are out of the picture as well because that CI job uses the
previous QEMU version's tests (i.e. 9.0).

I tried to reproduce it and no luck so far. Usually these bugs reproduce
well on my machine. I'll probably need to leave it running overnight to
find the race.

Patchew 2.1-devel-0870f84

© 2016 - 2024 Red Hat, Inc.