[PULL 0/8] Misc patches (Gitlab-CI, qtest, Capstone, ...)

Thomas Huth posted 8 patches 1 year, 11 months ago
docs/about/build-platforms.rst                     |  14 +-
configure                                          |  23 +---
meson.build                                        | 115 +---------------
include/qemu/osdep.h                               |   2 +-
tests/qtest/libqtest.c                             |  21 ++-
.gitlab-ci.d/buildtest.yml                         |   3 +-
.gitlab-ci.d/containers.yml                        |   5 -
.../custom-runners/ubuntu-20.04-aarch32.yml        |   2 +-
.../custom-runners/ubuntu-20.04-aarch64.yml        |   2 +-
.gitlab-ci.d/static_checks.yml                     |  14 +-
.gitlab-ci.d/windows.yml                           |   5 +-
.gitmodules                                        |   3 -
capstone                                           |   1 -
meson_options.txt                                  |   3 +-
scripts/ci/setup/build-environment.yml             |  14 +-
scripts/meson-buildoptions.sh                      |   5 +-
tests/docker/dockerfiles/ubuntu1804.docker         | 144 ---------------------
tests/lcitool/refresh                              |   7 -
tests/vm/netbsd                                    |   3 +-
tests/vm/openbsd                                   |   3 +-
20 files changed, 59 insertions(+), 330 deletions(-)
delete mode 160000 capstone
delete mode 100644 tests/docker/dockerfiles/ubuntu1804.docker
[PULL 0/8] Misc patches (Gitlab-CI, qtest, Capstone, ...)
Posted by Thomas Huth 1 year, 11 months ago
 Hi Richard!

The following changes since commit eec398119fc6911d99412c37af06a6bc27871f85:

  Merge tag 'for_upstream' of git://git.kernel.org/pub/scm/virt/kvm/mst/qemu into staging (2022-05-16 16:31:01 -0700)

are available in the Git repository at:

  https://gitlab.com/thuth/qemu.git tags/pull-request-2022-05-18

for you to fetch changes up to 83602083b4ada6ceb86bfb327e83556ebab120fc:

  capstone: Remove the capstone submodule (2022-05-18 08:54:22 +0200)

----------------------------------------------------------------
* Remove Ubuntu 18.04 containers (not supported anymore)
* Improve the cleanup of the QEMU binary in case of failing qtests
* Update the Windows support statement
* Remove the capstone submodule (and rely on Capstone of the distros instead)

----------------------------------------------------------------
Daniel P. Berrangé (2):
      tests/qtest: fix registration of ABRT handler for QEMU cleanup
      tests/qtest: use prctl(PR_SET_PDEATHSIG) as fallback to kill QEMU

Thomas Huth (6):
      gitlab-ci: Switch the container of the 'check-patch' & 'check-dco' jobs
      Remove Ubuntu 18.04 container support from the repository
      docs/about: Update the support statement for Windows
      tests/vm: Add capstone to the NetBSD and OpenBSD VMs
      capstone: Allow version 3.0.5 again
      capstone: Remove the capstone submodule

 docs/about/build-platforms.rst                     |  14 +-
 configure                                          |  23 +---
 meson.build                                        | 115 +---------------
 include/qemu/osdep.h                               |   2 +-
 tests/qtest/libqtest.c                             |  21 ++-
 .gitlab-ci.d/buildtest.yml                         |   3 +-
 .gitlab-ci.d/containers.yml                        |   5 -
 .../custom-runners/ubuntu-20.04-aarch32.yml        |   2 +-
 .../custom-runners/ubuntu-20.04-aarch64.yml        |   2 +-
 .gitlab-ci.d/static_checks.yml                     |  14 +-
 .gitlab-ci.d/windows.yml                           |   5 +-
 .gitmodules                                        |   3 -
 capstone                                           |   1 -
 meson_options.txt                                  |   3 +-
 scripts/ci/setup/build-environment.yml             |  14 +-
 scripts/meson-buildoptions.sh                      |   5 +-
 tests/docker/dockerfiles/ubuntu1804.docker         | 144 ---------------------
 tests/lcitool/refresh                              |   7 -
 tests/vm/netbsd                                    |   3 +-
 tests/vm/openbsd                                   |   3 +-
 20 files changed, 59 insertions(+), 330 deletions(-)
 delete mode 160000 capstone
 delete mode 100644 tests/docker/dockerfiles/ubuntu1804.docker


Re: [PULL 0/8] Misc patches (Gitlab-CI, qtest, Capstone, ...)
Posted by Richard Henderson 1 year, 11 months ago
On 5/18/22 02:04, Thomas Huth wrote:
>   Hi Richard!
> 
> The following changes since commit eec398119fc6911d99412c37af06a6bc27871f85:
> 
>    Merge tag 'for_upstream' of git://git.kernel.org/pub/scm/virt/kvm/mst/qemu into staging (2022-05-16 16:31:01 -0700)
> 
> are available in the Git repository at:
> 
>    https://gitlab.com/thuth/qemu.git tags/pull-request-2022-05-18
> 
> for you to fetch changes up to 83602083b4ada6ceb86bfb327e83556ebab120fc:
> 
>    capstone: Remove the capstone submodule (2022-05-18 08:54:22 +0200)
> 
> ----------------------------------------------------------------
> * Remove Ubuntu 18.04 containers (not supported anymore)
> * Improve the cleanup of the QEMU binary in case of failing qtests
> * Update the Windows support statement
> * Remove the capstone submodule (and rely on Capstone of the distros instead)

Fails centos-stream-8-x86_64 test,

Run-time dependency capstone found: NO (tried pkgconfig)
../meson.build:2539:2: ERROR: Dependency "capstone" not found, tried pkgconfig

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


r~



> 
> ----------------------------------------------------------------
> Daniel P. Berrangé (2):
>        tests/qtest: fix registration of ABRT handler for QEMU cleanup
>        tests/qtest: use prctl(PR_SET_PDEATHSIG) as fallback to kill QEMU
> 
> Thomas Huth (6):
>        gitlab-ci: Switch the container of the 'check-patch' & 'check-dco' jobs
>        Remove Ubuntu 18.04 container support from the repository
>        docs/about: Update the support statement for Windows
>        tests/vm: Add capstone to the NetBSD and OpenBSD VMs
>        capstone: Allow version 3.0.5 again
>        capstone: Remove the capstone submodule
> 
>   docs/about/build-platforms.rst                     |  14 +-
>   configure                                          |  23 +---
>   meson.build                                        | 115 +---------------
>   include/qemu/osdep.h                               |   2 +-
>   tests/qtest/libqtest.c                             |  21 ++-
>   .gitlab-ci.d/buildtest.yml                         |   3 +-
>   .gitlab-ci.d/containers.yml                        |   5 -
>   .../custom-runners/ubuntu-20.04-aarch32.yml        |   2 +-
>   .../custom-runners/ubuntu-20.04-aarch64.yml        |   2 +-
>   .gitlab-ci.d/static_checks.yml                     |  14 +-
>   .gitlab-ci.d/windows.yml                           |   5 +-
>   .gitmodules                                        |   3 -
>   capstone                                           |   1 -
>   meson_options.txt                                  |   3 +-
>   scripts/ci/setup/build-environment.yml             |  14 +-
>   scripts/meson-buildoptions.sh                      |   5 +-
>   tests/docker/dockerfiles/ubuntu1804.docker         | 144 ---------------------
>   tests/lcitool/refresh                              |   7 -
>   tests/vm/netbsd                                    |   3 +-
>   tests/vm/openbsd                                   |   3 +-
>   20 files changed, 59 insertions(+), 330 deletions(-)
>   delete mode 160000 capstone
>   delete mode 100644 tests/docker/dockerfiles/ubuntu1804.docker
> 


Re: [PULL 0/8] Misc patches (Gitlab-CI, qtest, Capstone, ...)
Posted by Thomas Huth 1 year, 11 months ago
On 18/05/2022 18.12, Richard Henderson wrote:
> On 5/18/22 02:04, Thomas Huth wrote:
>>   Hi Richard!
>>
>> The following changes since commit eec398119fc6911d99412c37af06a6bc27871f85:
>>
>>    Merge tag 'for_upstream' of 
>> git://git.kernel.org/pub/scm/virt/kvm/mst/qemu into staging (2022-05-16 
>> 16:31:01 -0700)
>>
>> are available in the Git repository at:
>>
>>    https://gitlab.com/thuth/qemu.git tags/pull-request-2022-05-18
>>
>> for you to fetch changes up to 83602083b4ada6ceb86bfb327e83556ebab120fc:
>>
>>    capstone: Remove the capstone submodule (2022-05-18 08:54:22 +0200)
>>
>> ----------------------------------------------------------------
>> * Remove Ubuntu 18.04 containers (not supported anymore)
>> * Improve the cleanup of the QEMU binary in case of failing qtests
>> * Update the Windows support statement
>> * Remove the capstone submodule (and rely on Capstone of the distros instead)
> 
> Fails centos-stream-8-x86_64 test,
> 
> Run-time dependency capstone found: NO (tried pkgconfig)
> ../meson.build:2539:2: ERROR: Dependency "capstone" not found, tried pkgconfig
> 
> https://gitlab.com/qemu-project/qemu/-/jobs/2473935684

That's a custom runner ... who has access to that one? Cleber? Stefan? I 
didn't spot an entry for it on https://wiki.qemu.org/AdminContacts ...

Anyway, somebody needs to install "capstone-devel" on that machine - or we 
need to disable capstone in scripts/ci/org.centos/stream/8/x86_64/configure 
now if the machine can't be changed...

  Thomas


Re: [PULL 0/8] Misc patches (Gitlab-CI, qtest, Capstone, ...)
Posted by Peter Maydell 1 year, 11 months ago
On Thu, 19 May 2022 at 07:32, Thomas Huth <thuth@redhat.com> wrote:
>
> On 18/05/2022 18.12, Richard Henderson wrote:
> > On 5/18/22 02:04, Thomas Huth wrote:
> >>   Hi Richard!
> >>
> >> The following changes since commit eec398119fc6911d99412c37af06a6bc27871f85:
> >>
> >>    Merge tag 'for_upstream' of
> >> git://git.kernel.org/pub/scm/virt/kvm/mst/qemu into staging (2022-05-16
> >> 16:31:01 -0700)
> >>
> >> are available in the Git repository at:
> >>
> >>    https://gitlab.com/thuth/qemu.git tags/pull-request-2022-05-18
> >>
> >> for you to fetch changes up to 83602083b4ada6ceb86bfb327e83556ebab120fc:
> >>
> >>    capstone: Remove the capstone submodule (2022-05-18 08:54:22 +0200)
> >>
> >> ----------------------------------------------------------------
> >> * Remove Ubuntu 18.04 containers (not supported anymore)
> >> * Improve the cleanup of the QEMU binary in case of failing qtests
> >> * Update the Windows support statement
> >> * Remove the capstone submodule (and rely on Capstone of the distros instead)
> >
> > Fails centos-stream-8-x86_64 test,
> >
> > Run-time dependency capstone found: NO (tried pkgconfig)
> > ../meson.build:2539:2: ERROR: Dependency "capstone" not found, tried pkgconfig
> >
> > https://gitlab.com/qemu-project/qemu/-/jobs/2473935684
>
> That's a custom runner ... who has access to that one? Cleber? Stefan? I
> didn't spot an entry for it on https://wiki.qemu.org/AdminContacts ...

The 'Runner' string on the web page says:
"(Managed by Red Hat - willianr/clebergnu)"

> Anyway, somebody needs to install "capstone-devel" on that machine - or we
> need to disable capstone in scripts/ci/org.centos/stream/8/x86_64/configure
> now if the machine can't be changed...

-- PMM
Re: [PULL 0/8] Misc patches (Gitlab-CI, qtest, Capstone, ...)
Posted by Thomas Huth 1 year, 11 months ago
On 19/05/2022 13.55, Peter Maydell wrote:
> On Thu, 19 May 2022 at 07:32, Thomas Huth <thuth@redhat.com> wrote:
>>
>> On 18/05/2022 18.12, Richard Henderson wrote:
>>> On 5/18/22 02:04, Thomas Huth wrote:
>>>>    Hi Richard!
>>>>
>>>> The following changes since commit eec398119fc6911d99412c37af06a6bc27871f85:
>>>>
>>>>     Merge tag 'for_upstream' of
>>>> git://git.kernel.org/pub/scm/virt/kvm/mst/qemu into staging (2022-05-16
>>>> 16:31:01 -0700)
>>>>
>>>> are available in the Git repository at:
>>>>
>>>>     https://gitlab.com/thuth/qemu.git tags/pull-request-2022-05-18
>>>>
>>>> for you to fetch changes up to 83602083b4ada6ceb86bfb327e83556ebab120fc:
>>>>
>>>>     capstone: Remove the capstone submodule (2022-05-18 08:54:22 +0200)
>>>>
>>>> ----------------------------------------------------------------
>>>> * Remove Ubuntu 18.04 containers (not supported anymore)
>>>> * Improve the cleanup of the QEMU binary in case of failing qtests
>>>> * Update the Windows support statement
>>>> * Remove the capstone submodule (and rely on Capstone of the distros instead)
>>>
>>> Fails centos-stream-8-x86_64 test,
>>>
>>> Run-time dependency capstone found: NO (tried pkgconfig)
>>> ../meson.build:2539:2: ERROR: Dependency "capstone" not found, tried pkgconfig
>>>
>>> https://gitlab.com/qemu-project/qemu/-/jobs/2473935684
>>
>> That's a custom runner ... who has access to that one? Cleber? Stefan? I
>> didn't spot an entry for it on https://wiki.qemu.org/AdminContacts ...
> 
> The 'Runner' string on the web page says:
> "(Managed by Red Hat - willianr/clebergnu)"

Willian left, Cleber seems to be currently away from keyboard ... but I 
found someone who has access, so capstone-devel should hopefully be there now.

Richard, could you please re-try to merge the pull request?

  Thanks,
   Thomas
Re: [PULL 0/8] Misc patches (Gitlab-CI, qtest, Capstone, ...)
Posted by Richard Henderson 1 year, 11 months ago
On 5/19/22 23:22, Thomas Huth wrote:
> On 19/05/2022 13.55, Peter Maydell wrote:
>> On Thu, 19 May 2022 at 07:32, Thomas Huth <thuth@redhat.com> wrote:
>>>
>>> On 18/05/2022 18.12, Richard Henderson wrote:
>>>> On 5/18/22 02:04, Thomas Huth wrote:
>>>>>    Hi Richard!
>>>>>
>>>>> The following changes since commit eec398119fc6911d99412c37af06a6bc27871f85:
>>>>>
>>>>>     Merge tag 'for_upstream' of
>>>>> git://git.kernel.org/pub/scm/virt/kvm/mst/qemu into staging (2022-05-16
>>>>> 16:31:01 -0700)
>>>>>
>>>>> are available in the Git repository at:
>>>>>
>>>>>     https://gitlab.com/thuth/qemu.git tags/pull-request-2022-05-18
>>>>>
>>>>> for you to fetch changes up to 83602083b4ada6ceb86bfb327e83556ebab120fc:
>>>>>
>>>>>     capstone: Remove the capstone submodule (2022-05-18 08:54:22 +0200)
>>>>>
>>>>> ----------------------------------------------------------------
>>>>> * Remove Ubuntu 18.04 containers (not supported anymore)
>>>>> * Improve the cleanup of the QEMU binary in case of failing qtests
>>>>> * Update the Windows support statement
>>>>> * Remove the capstone submodule (and rely on Capstone of the distros instead)
>>>>
>>>> Fails centos-stream-8-x86_64 test,
>>>>
>>>> Run-time dependency capstone found: NO (tried pkgconfig)
>>>> ../meson.build:2539:2: ERROR: Dependency "capstone" not found, tried pkgconfig
>>>>
>>>> https://gitlab.com/qemu-project/qemu/-/jobs/2473935684
>>>
>>> That's a custom runner ... who has access to that one? Cleber? Stefan? I
>>> didn't spot an entry for it on https://wiki.qemu.org/AdminContacts ...
>>
>> The 'Runner' string on the web page says:
>> "(Managed by Red Hat - willianr/clebergnu)"
> 
> Willian left, Cleber seems to be currently away from keyboard ... but I found someone who 
> has access, so capstone-devel should hopefully be there now.
> 
> Richard, could you please re-try to merge the pull request?

Applied, thanks.  Please update https://wiki.qemu.org/ChangeLog/7.1 as appropriate.


r~



Re: [PULL 0/8] Misc patches (Gitlab-CI, qtest, Capstone, ...)
Posted by Daniel P. Berrangé 1 year, 11 months ago
On Thu, May 19, 2022 at 08:29:09AM +0200, Thomas Huth wrote:
> On 18/05/2022 18.12, Richard Henderson wrote:
> > On 5/18/22 02:04, Thomas Huth wrote:
> > >   Hi Richard!
> > > 
> > > The following changes since commit eec398119fc6911d99412c37af06a6bc27871f85:
> > > 
> > >    Merge tag 'for_upstream' of
> > > git://git.kernel.org/pub/scm/virt/kvm/mst/qemu into staging
> > > (2022-05-16 16:31:01 -0700)
> > > 
> > > are available in the Git repository at:
> > > 
> > >    https://gitlab.com/thuth/qemu.git tags/pull-request-2022-05-18
> > > 
> > > for you to fetch changes up to 83602083b4ada6ceb86bfb327e83556ebab120fc:
> > > 
> > >    capstone: Remove the capstone submodule (2022-05-18 08:54:22 +0200)
> > > 
> > > ----------------------------------------------------------------
> > > * Remove Ubuntu 18.04 containers (not supported anymore)
> > > * Improve the cleanup of the QEMU binary in case of failing qtests
> > > * Update the Windows support statement
> > > * Remove the capstone submodule (and rely on Capstone of the distros instead)
> > 
> > Fails centos-stream-8-x86_64 test,
> > 
> > Run-time dependency capstone found: NO (tried pkgconfig)
> > ../meson.build:2539:2: ERROR: Dependency "capstone" not found, tried pkgconfig
> > 
> > https://gitlab.com/qemu-project/qemu/-/jobs/2473935684
> 
> That's a custom runner ... who has access to that one? Cleber? Stefan? I
> didn't spot an entry for it on https://wiki.qemu.org/AdminContacts ...
> 
> Anyway, somebody needs to install "capstone-devel" on that machine - or we
> need to disable capstone in scripts/ci/org.centos/stream/8/x86_64/configure
> now if the machine can't be changed...

This is pretty that when we add build deps we need someone to manually
inconvenient as a requirement :-(

It would be really nice if the host could run the jobs in containers,
so when the pull request contains container updates, it "just works"
in the same way as the standard gitlab runners.


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 0/8] Misc patches (Gitlab-CI, qtest, Capstone, ...)
Posted by Stefan Hajnoczi 1 year, 11 months ago
On Thu, May 19, 2022 at 08:29:09AM +0200, Thomas Huth wrote:
> On 18/05/2022 18.12, Richard Henderson wrote:
> > On 5/18/22 02:04, Thomas Huth wrote:
> > >   Hi Richard!
> > > 
> > > The following changes since commit eec398119fc6911d99412c37af06a6bc27871f85:
> > > 
> > >    Merge tag 'for_upstream' of
> > > git://git.kernel.org/pub/scm/virt/kvm/mst/qemu into staging
> > > (2022-05-16 16:31:01 -0700)
> > > 
> > > are available in the Git repository at:
> > > 
> > >    https://gitlab.com/thuth/qemu.git tags/pull-request-2022-05-18
> > > 
> > > for you to fetch changes up to 83602083b4ada6ceb86bfb327e83556ebab120fc:
> > > 
> > >    capstone: Remove the capstone submodule (2022-05-18 08:54:22 +0200)
> > > 
> > > ----------------------------------------------------------------
> > > * Remove Ubuntu 18.04 containers (not supported anymore)
> > > * Improve the cleanup of the QEMU binary in case of failing qtests
> > > * Update the Windows support statement
> > > * Remove the capstone submodule (and rely on Capstone of the distros instead)
> > 
> > Fails centos-stream-8-x86_64 test,
> > 
> > Run-time dependency capstone found: NO (tried pkgconfig)
> > ../meson.build:2539:2: ERROR: Dependency "capstone" not found, tried pkgconfig
> > 
> > https://gitlab.com/qemu-project/qemu/-/jobs/2473935684
> 
> That's a custom runner ... who has access to that one? Cleber? Stefan? I
> didn't spot an entry for it on https://wiki.qemu.org/AdminContacts ...
> 
> Anyway, somebody needs to install "capstone-devel" on that machine - or we
> need to disable capstone in scripts/ci/org.centos/stream/8/x86_64/configure
> now if the machine can't be changed...

I don't manage a custom CI runner for QEMU.

Stefan