mbox series

[v3,0/4] tests/vm/freebsd: Get up-to-date package list from lcitool

Message ID 20230711144922.67491-1-philmd@linaro.org
Headers show
Series tests/vm/freebsd: Get up-to-date package list from lcitool | expand

Message

Philippe Mathieu-Daudé July 11, 2023, 2:49 p.m. UTC
Inspired by this patch from Thomas:
https://lore.kernel.org/qemu-devel/20230531090415.40421-1-thuth@redhat.com/

Instead of updating the package list manually, use lcitool vars file.

Since v2:
- Commit generated json (Daniel)

Since v1:
- Addressed Erik & Daniel comments (generate in JSON)

Philippe Mathieu-Daudé (4):
  tests/lcitool: Generate distribution packages list in JSON format
  tests/lcitool: Refresh generated files
  tests/vm: Introduce get_qemu_packages_from_lcitool_json() helper
  tests/vm/freebsd: Get up-to-date package list from lcitool vars file

 tests/docker/dockerfiles/debian-amd64.docker |  2 -
 tests/docker/dockerfiles/ubuntu2004.docker   |  2 -
 tests/docker/dockerfiles/ubuntu2204.docker   |  2 -
 tests/lcitool/refresh                        | 11 +++
 tests/vm/basevm.py                           | 11 +++
 tests/vm/freebsd                             | 42 +----------
 tests/vm/generated/README                    |  5 ++
 tests/vm/generated/freebsd.json              | 77 ++++++++++++++++++++
 8 files changed, 106 insertions(+), 46 deletions(-)
 create mode 100644 tests/vm/generated/README
 create mode 100644 tests/vm/generated/freebsd.json

Comments

Thomas Huth July 17, 2023, 12:18 p.m. UTC | #1
On 11/07/2023 16.49, Philippe Mathieu-Daudé wrote:
> Inspired by this patch from Thomas:
> https://lore.kernel.org/qemu-devel/20230531090415.40421-1-thuth@redhat.com/
> 
> Instead of updating the package list manually, use lcitool vars file.
> 
> Since v2:
> - Commit generated json (Daniel)
> 
> Since v1:
> - Addressed Erik & Daniel comments (generate in JSON)
> 
> Philippe Mathieu-Daudé (4):
>    tests/lcitool: Generate distribution packages list in JSON format
>    tests/lcitool: Refresh generated files
>    tests/vm: Introduce get_qemu_packages_from_lcitool_json() helper
>    tests/vm/freebsd: Get up-to-date package list from lcitool vars file
> 
>   tests/docker/dockerfiles/debian-amd64.docker |  2 -
>   tests/docker/dockerfiles/ubuntu2004.docker   |  2 -
>   tests/docker/dockerfiles/ubuntu2204.docker   |  2 -

Thanks, I'm queuing your patches for my next pull request - but I'm dropping 
the hunks that change libpmem-dev and libxen-dev in the docker files - 
otherwise this would just get reverted once somebody using a x86 host runs 
the refresh step again. I hope this issue can be tackled by a future lcitool 
update instead.

  Thomas
Erik Skultety July 17, 2023, 12:30 p.m. UTC | #2
On Mon, Jul 17, 2023 at 02:18:34PM +0200, Thomas Huth wrote:
> On 11/07/2023 16.49, Philippe Mathieu-Daudé wrote:
> > Inspired by this patch from Thomas:
> > https://lore.kernel.org/qemu-devel/20230531090415.40421-1-thuth@redhat.com/
> > 
> > Instead of updating the package list manually, use lcitool vars file.
> > 
> > Since v2:
> > - Commit generated json (Daniel)
> > 
> > Since v1:
> > - Addressed Erik & Daniel comments (generate in JSON)
> > 
> > Philippe Mathieu-Daudé (4):
> >    tests/lcitool: Generate distribution packages list in JSON format
> >    tests/lcitool: Refresh generated files
> >    tests/vm: Introduce get_qemu_packages_from_lcitool_json() helper
> >    tests/vm/freebsd: Get up-to-date package list from lcitool vars file
> > 
> >   tests/docker/dockerfiles/debian-amd64.docker |  2 -
> >   tests/docker/dockerfiles/ubuntu2004.docker   |  2 -
> >   tests/docker/dockerfiles/ubuntu2204.docker   |  2 -
> 
> Thanks, I'm queuing your patches for my next pull request - but I'm dropping
> the hunks that change libpmem-dev and libxen-dev in the docker files -
> otherwise this would just get reverted once somebody using a x86 host runs
> the refresh step again. I hope this issue can be tackled by a future lcitool
> update instead.
> 
>  Thomas
> 

Can you guys please create an issue at
https://gitlab.com/libvirt/libvirt-ci.git to have this officially tracked?

Thanks,
Erik
Daniel P. Berrangé July 17, 2023, 1:17 p.m. UTC | #3
On Mon, Jul 17, 2023 at 02:30:03PM +0200, Erik Skultety wrote:
> On Mon, Jul 17, 2023 at 02:18:34PM +0200, Thomas Huth wrote:
> > On 11/07/2023 16.49, Philippe Mathieu-Daudé wrote:
> > > Inspired by this patch from Thomas:
> > > https://lore.kernel.org/qemu-devel/20230531090415.40421-1-thuth@redhat.com/
> > > 
> > > Instead of updating the package list manually, use lcitool vars file.
> > > 
> > > Since v2:
> > > - Commit generated json (Daniel)
> > > 
> > > Since v1:
> > > - Addressed Erik & Daniel comments (generate in JSON)
> > > 
> > > Philippe Mathieu-Daudé (4):
> > >    tests/lcitool: Generate distribution packages list in JSON format
> > >    tests/lcitool: Refresh generated files
> > >    tests/vm: Introduce get_qemu_packages_from_lcitool_json() helper
> > >    tests/vm/freebsd: Get up-to-date package list from lcitool vars file
> > > 
> > >   tests/docker/dockerfiles/debian-amd64.docker |  2 -
> > >   tests/docker/dockerfiles/ubuntu2004.docker   |  2 -
> > >   tests/docker/dockerfiles/ubuntu2204.docker   |  2 -
> > 
> > Thanks, I'm queuing your patches for my next pull request - but I'm dropping
> > the hunks that change libpmem-dev and libxen-dev in the docker files -
> > otherwise this would just get reverted once somebody using a x86 host runs
> > the refresh step again. I hope this issue can be tackled by a future lcitool
> > update instead.
> > 
> >  Thomas
> > 
> 
> Can you guys please create an issue at
> https://gitlab.com/libvirt/libvirt-ci.git to have this officially tracked?

Done:

https://gitlab.com/libvirt/libvirt-ci/-/issues/26


With regards,
Daniel