[PATCH v2 0/2] tests/lcitool: Add mtools and xorriso and remove genisoimage as dependencies

Ani Sinha posted 2 patches 1 year ago
Patches applied successfully (tree, apply log)
git fetch https://github.com/patchew-project/qemu tags/patchew/20230504154611.85854-1-anisinha@redhat.com
Maintainers: Ed Maste <emaste@freebsd.org>, Li-Wen Hsu <lwhsu@freebsd.org>, "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>, John Snow <jsnow@redhat.com>, Laurent Vivier <lvivier@redhat.com>, Paolo Bonzini <pbonzini@redhat.com>
.gitlab-ci.d/cirrus/freebsd-13.vars                |  2 +-
.gitlab-ci.d/cirrus/macos-12.vars                  |  2 +-
tests/docker/dockerfiles/alpine.docker             |  3 ++-
tests/docker/dockerfiles/centos8.docker            |  3 ++-
tests/docker/dockerfiles/debian-amd64-cross.docker |  3 ++-
tests/docker/dockerfiles/debian-amd64.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 ++-
.../dockerfiles/debian-mips64el-cross.docker       |  3 ++-
.../docker/dockerfiles/debian-mipsel-cross.docker  |  3 ++-
.../docker/dockerfiles/debian-ppc64el-cross.docker |  3 ++-
tests/docker/dockerfiles/debian-s390x-cross.docker |  3 ++-
tests/docker/dockerfiles/fedora-win32-cross.docker |  3 ++-
tests/docker/dockerfiles/fedora-win64-cross.docker |  3 ++-
tests/docker/dockerfiles/fedora.docker             |  3 ++-
tests/docker/dockerfiles/opensuse-leap.docker      |  3 ++-
tests/docker/dockerfiles/ubuntu2004.docker         |  3 ++-
tests/docker/dockerfiles/ubuntu2204.docker         |  3 ++-
tests/lcitool/libvirt-ci                           |  2 +-
tests/lcitool/projects/qemu.yml                    |  3 ++-
tests/qtest/cdrom-test.c                           | 14 +++++++-------
22 files changed, 46 insertions(+), 28 deletions(-)
[PATCH v2 0/2] tests/lcitool: Add mtools and xorriso and remove genisoimage as dependencies
Posted by Ani Sinha 1 year ago
mformat and xorriso tools are needed by biosbits avocado tests. This patchset
adds those two tools in the docker container images.
xorriso package conflicts with genisoimage package on some distributions.
Therefore, it is not possible to have both the packages at the same time
in the container image uniformly for all distribution flavors. Further,
on some distributions like RHEL, both xorriso and genisoimage
packages provide /usr/bin/genisoimage and on some other distributions like
Fedora, only genisoimage package provides the same utility.
Therefore, this change removes the dependency on geninsoimage for building
container images altogether keeping only xorriso package. At the same time,
cdrom-test.c is updated to use and check for existence of only xorrisofs.

Patch 1 pulls in the latest changes in lcitool in order to add mappings
for these packages in various distros.
Patch 2 updates all Dockerfiles in QEMU repository to add these two
tools. It also removed genisoimage package and updated cdrom-test to not
use genisoimage but xorrisofs.

CC: mst@redhat.com
CC: berrange@redhat.com
CC: alex.bennee@linaro.org
CC: philmd@linaro.org
CC: wainersm@redhat.com
CC: bleal@redhat.com
CC: thuth@redhat.com
TO: qemu-devel@nongnu.org

Changelog:
v2: remove genisoimage package and update Dockerfile. Also update cdrom-test.c
so that it uses xorrisofs and not genisoimage. I have tested patch #2 on both
Fedora 37 and RHEL 9.1. cdrom-test passed on both.

Ani Sinha (2):
  tests: libvirt-ci: Update to commit 'c8971e90ac' to pull in mformat
    and xorriso
  tests/lcitool: Add mtools and xorriso and remove genisoimage as
    dependencies

 .gitlab-ci.d/cirrus/freebsd-13.vars                |  2 +-
 .gitlab-ci.d/cirrus/macos-12.vars                  |  2 +-
 tests/docker/dockerfiles/alpine.docker             |  3 ++-
 tests/docker/dockerfiles/centos8.docker            |  3 ++-
 tests/docker/dockerfiles/debian-amd64-cross.docker |  3 ++-
 tests/docker/dockerfiles/debian-amd64.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 ++-
 .../dockerfiles/debian-mips64el-cross.docker       |  3 ++-
 .../docker/dockerfiles/debian-mipsel-cross.docker  |  3 ++-
 .../docker/dockerfiles/debian-ppc64el-cross.docker |  3 ++-
 tests/docker/dockerfiles/debian-s390x-cross.docker |  3 ++-
 tests/docker/dockerfiles/fedora-win32-cross.docker |  3 ++-
 tests/docker/dockerfiles/fedora-win64-cross.docker |  3 ++-
 tests/docker/dockerfiles/fedora.docker             |  3 ++-
 tests/docker/dockerfiles/opensuse-leap.docker      |  3 ++-
 tests/docker/dockerfiles/ubuntu2004.docker         |  3 ++-
 tests/docker/dockerfiles/ubuntu2204.docker         |  3 ++-
 tests/lcitool/libvirt-ci                           |  2 +-
 tests/lcitool/projects/qemu.yml                    |  3 ++-
 tests/qtest/cdrom-test.c                           | 14 +++++++-------
 22 files changed, 46 insertions(+), 28 deletions(-)

-- 
2.31.1
Re: [PATCH v2 0/2] tests/lcitool: Add mtools and xorriso and remove genisoimage as dependencies
Posted by Michael S. Tsirkin 12 months ago
On Thu, May 04, 2023 at 09:16:09PM +0530, Ani Sinha wrote:
> mformat and xorriso tools are needed by biosbits avocado tests. This patchset
> adds those two tools in the docker container images.
> xorriso package conflicts with genisoimage package on some distributions.
> Therefore, it is not possible to have both the packages at the same time
> in the container image uniformly for all distribution flavors. Further,
> on some distributions like RHEL, both xorriso and genisoimage
> packages provide /usr/bin/genisoimage and on some other distributions like
> Fedora, only genisoimage package provides the same utility.
> Therefore, this change removes the dependency on geninsoimage for building
> container images altogether keeping only xorriso package. At the same time,
> cdrom-test.c is updated to use and check for existence of only xorrisofs.
> 
> Patch 1 pulls in the latest changes in lcitool in order to add mappings
> for these packages in various distros.
> Patch 2 updates all Dockerfiles in QEMU repository to add these two
> tools. It also removed genisoimage package and updated cdrom-test to not
> use genisoimage but xorrisofs.
> 
> CC: mst@redhat.com
> CC: berrange@redhat.com
> CC: alex.bennee@linaro.org
> CC: philmd@linaro.org
> CC: wainersm@redhat.com
> CC: bleal@redhat.com
> CC: thuth@redhat.com
> TO: qemu-devel@nongnu.org
> 
> Changelog:
> v2: remove genisoimage package and update Dockerfile. Also update cdrom-test.c
> so that it uses xorrisofs and not genisoimage. I have tested patch #2 on both
> Fedora 37 and RHEL 9.1. cdrom-test passed on both.


Reviewed-by: Michael S. Tsirkin <mst@redhat.com>

who's merging this?

> Ani Sinha (2):
>   tests: libvirt-ci: Update to commit 'c8971e90ac' to pull in mformat
>     and xorriso
>   tests/lcitool: Add mtools and xorriso and remove genisoimage as
>     dependencies
> 
>  .gitlab-ci.d/cirrus/freebsd-13.vars                |  2 +-
>  .gitlab-ci.d/cirrus/macos-12.vars                  |  2 +-
>  tests/docker/dockerfiles/alpine.docker             |  3 ++-
>  tests/docker/dockerfiles/centos8.docker            |  3 ++-
>  tests/docker/dockerfiles/debian-amd64-cross.docker |  3 ++-
>  tests/docker/dockerfiles/debian-amd64.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 ++-
>  .../dockerfiles/debian-mips64el-cross.docker       |  3 ++-
>  .../docker/dockerfiles/debian-mipsel-cross.docker  |  3 ++-
>  .../docker/dockerfiles/debian-ppc64el-cross.docker |  3 ++-
>  tests/docker/dockerfiles/debian-s390x-cross.docker |  3 ++-
>  tests/docker/dockerfiles/fedora-win32-cross.docker |  3 ++-
>  tests/docker/dockerfiles/fedora-win64-cross.docker |  3 ++-
>  tests/docker/dockerfiles/fedora.docker             |  3 ++-
>  tests/docker/dockerfiles/opensuse-leap.docker      |  3 ++-
>  tests/docker/dockerfiles/ubuntu2004.docker         |  3 ++-
>  tests/docker/dockerfiles/ubuntu2204.docker         |  3 ++-
>  tests/lcitool/libvirt-ci                           |  2 +-
>  tests/lcitool/projects/qemu.yml                    |  3 ++-
>  tests/qtest/cdrom-test.c                           | 14 +++++++-------
>  22 files changed, 46 insertions(+), 28 deletions(-)
> 
> -- 
> 2.31.1
Re: [PATCH v2 0/2] tests/lcitool: Add mtools and xorriso and remove genisoimage as dependencies
Posted by Thomas Huth 12 months ago
On 09/05/2023 18.16, Michael S. Tsirkin wrote:
> On Thu, May 04, 2023 at 09:16:09PM +0530, Ani Sinha wrote:
>> mformat and xorriso tools are needed by biosbits avocado tests. This patchset
>> adds those two tools in the docker container images.
>> xorriso package conflicts with genisoimage package on some distributions.
>> Therefore, it is not possible to have both the packages at the same time
>> in the container image uniformly for all distribution flavors. Further,
>> on some distributions like RHEL, both xorriso and genisoimage
>> packages provide /usr/bin/genisoimage and on some other distributions like
>> Fedora, only genisoimage package provides the same utility.
>> Therefore, this change removes the dependency on geninsoimage for building
>> container images altogether keeping only xorriso package. At the same time,
>> cdrom-test.c is updated to use and check for existence of only xorrisofs.
>>
>> Patch 1 pulls in the latest changes in lcitool in order to add mappings
>> for these packages in various distros.
>> Patch 2 updates all Dockerfiles in QEMU repository to add these two
>> tools. It also removed genisoimage package and updated cdrom-test to not
>> use genisoimage but xorrisofs.
>>
>> CC: mst@redhat.com
>> CC: berrange@redhat.com
>> CC: alex.bennee@linaro.org
>> CC: philmd@linaro.org
>> CC: wainersm@redhat.com
>> CC: bleal@redhat.com
>> CC: thuth@redhat.com
>> TO: qemu-devel@nongnu.org
>>
>> Changelog:
>> v2: remove genisoimage package and update Dockerfile. Also update cdrom-test.c
>> so that it uses xorrisofs and not genisoimage. I have tested patch #2 on both
>> Fedora 37 and RHEL 9.1. cdrom-test passed on both.
> 
> 
> Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
> 
> who's merging this?

I guess it's either you, Alex or me ... I'll put it into my queue, but if 
you plan a pull request soon, feel free to take it first.

  Thomas
Re: [PATCH v2 0/2] tests/lcitool: Add mtools and xorriso and remove genisoimage as dependencies
Posted by Michael S. Tsirkin 12 months ago
On Wed, May 10, 2023 at 08:39:54AM +0200, Thomas Huth wrote:
> On 09/05/2023 18.16, Michael S. Tsirkin wrote:
> > On Thu, May 04, 2023 at 09:16:09PM +0530, Ani Sinha wrote:
> > > mformat and xorriso tools are needed by biosbits avocado tests. This patchset
> > > adds those two tools in the docker container images.
> > > xorriso package conflicts with genisoimage package on some distributions.
> > > Therefore, it is not possible to have both the packages at the same time
> > > in the container image uniformly for all distribution flavors. Further,
> > > on some distributions like RHEL, both xorriso and genisoimage
> > > packages provide /usr/bin/genisoimage and on some other distributions like
> > > Fedora, only genisoimage package provides the same utility.
> > > Therefore, this change removes the dependency on geninsoimage for building
> > > container images altogether keeping only xorriso package. At the same time,
> > > cdrom-test.c is updated to use and check for existence of only xorrisofs.
> > > 
> > > Patch 1 pulls in the latest changes in lcitool in order to add mappings
> > > for these packages in various distros.
> > > Patch 2 updates all Dockerfiles in QEMU repository to add these two
> > > tools. It also removed genisoimage package and updated cdrom-test to not
> > > use genisoimage but xorrisofs.
> > > 
> > > CC: mst@redhat.com
> > > CC: berrange@redhat.com
> > > CC: alex.bennee@linaro.org
> > > CC: philmd@linaro.org
> > > CC: wainersm@redhat.com
> > > CC: bleal@redhat.com
> > > CC: thuth@redhat.com
> > > TO: qemu-devel@nongnu.org
> > > 
> > > Changelog:
> > > v2: remove genisoimage package and update Dockerfile. Also update cdrom-test.c
> > > so that it uses xorrisofs and not genisoimage. I have tested patch #2 on both
> > > Fedora 37 and RHEL 9.1. cdrom-test passed on both.
> > 
> > 
> > Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
> > 
> > who's merging this?
> 
> I guess it's either you, Alex or me ... I'll put it into my queue, but if
> you plan a pull request soon, feel free to take it first.
> 
>  Thomas

yes there's a pull by end of week. sure I'll take this.

-- 
MST
Re: [PATCH v2 0/2] tests/lcitool: Add mtools and xorriso and remove genisoimage as dependencies
Posted by Ani Sinha 1 year ago

> On 04-May-2023, at 9:16 PM, Ani Sinha <anisinha@redhat.com> wrote:
> 
> mformat and xorriso tools are needed by biosbits avocado tests. This patchset
> adds those two tools in the docker container images.
> xorriso package conflicts with genisoimage package on some distributions.
> Therefore, it is not possible to have both the packages at the same time
> in the container image uniformly for all distribution flavors. Further,
> on some distributions like RHEL, both xorriso and genisoimage
> packages provide /usr/bin/genisoimage and on some other distributions like
> Fedora, only genisoimage package provides the same utility.
> Therefore, this change removes the dependency on geninsoimage for building
> container images altogether keeping only xorriso package. At the same time,
> cdrom-test.c is updated to use and check for existence of only xorrisofs.
> 
> Patch 1 pulls in the latest changes in lcitool in order to add mappings
> for these packages in various distros.
> Patch 2 updates all Dockerfiles in QEMU repository to add these two
> tools. It also removed genisoimage package and updated cdrom-test to not
> use genisoimage but xorrisofs.
> 
> CC: mst@redhat.com
> CC: berrange@redhat.com
> CC: alex.bennee@linaro.org
> CC: philmd@linaro.org
> CC: wainersm@redhat.com
> CC: bleal@redhat.com
> CC: thuth@redhat.com
> TO: qemu-devel@nongnu.org
> 
> Changelog:
> v2: remove genisoimage package and update Dockerfile. Also update cdrom-test.c
> so that it uses xorrisofs and not genisoimage. I have tested patch #2 on both
> Fedora 37 and RHEL 9.1. cdrom-test passed on both.

Also running this pipeline right now to verify:

https://gitlab.com/anisinha/qemu/-/pipelines/857490765