[PATCH 0/2] Add mformat and xorriso dependencies in containers

[PATCH 0/2] Add mformat and xorriso dependencies in containers

[Ani Sinha]

mformat and xorriso tools are needed by biosbits avocado tests. This patchset
adds those two tools in the docker container images.
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.

CC: mst@redhat.com
CC: berrange@redhat.com

Ani Sinha (2):
  tests: libvirt-ci: Update to commit 'c8971e90ac' to pull in mformat
    and xorriso
  tests/lcitool: Add mtools and xorriso as dependency for bios bits
    avocado tests

 .gitlab-ci.d/cirrus/freebsd-13.vars                   | 2 +-
 .gitlab-ci.d/cirrus/macos-12.vars                     | 2 +-
 tests/docker/dockerfiles/alpine.docker                | 2 ++
 tests/docker/dockerfiles/centos8.docker               | 2 ++
 tests/docker/dockerfiles/debian-amd64-cross.docker    | 2 ++
 tests/docker/dockerfiles/debian-amd64.docker          | 2 ++
 tests/docker/dockerfiles/debian-arm64-cross.docker    | 2 ++
 tests/docker/dockerfiles/debian-armel-cross.docker    | 2 ++
 tests/docker/dockerfiles/debian-armhf-cross.docker    | 2 ++
 tests/docker/dockerfiles/debian-mips64el-cross.docker | 2 ++
 tests/docker/dockerfiles/debian-mipsel-cross.docker   | 2 ++
 tests/docker/dockerfiles/debian-ppc64el-cross.docker  | 2 ++
 tests/docker/dockerfiles/debian-s390x-cross.docker    | 2 ++
 tests/docker/dockerfiles/fedora-win32-cross.docker    | 2 ++
 tests/docker/dockerfiles/fedora-win64-cross.docker    | 2 ++
 tests/docker/dockerfiles/fedora.docker                | 2 ++
 tests/docker/dockerfiles/opensuse-leap.docker         | 2 ++
 tests/docker/dockerfiles/ubuntu2004.docker            | 2 ++
 tests/docker/dockerfiles/ubuntu2204.docker            | 2 ++
 tests/lcitool/libvirt-ci                              | 2 +-
 tests/lcitool/projects/qemu.yml                       | 2 ++
 21 files changed, 39 insertions(+), 3 deletions(-)

-- 
2.31.1

[PATCH 1/2] tests: libvirt-ci: Update to commit 'c8971e90ac' to pull in mformat and xorriso

[Ani Sinha]

Pull in the following changes from lcitool:

* tests/lcitool/libvirt-ci 85487e1...c8971e9 (18):
  > mappings: add new package mappings for mformat and xorriso
  > docs: testing: Update contents with tox
  > .gitlab-ci.yml: Always test against installed lcitool
  > gitlab-ci.yml: Start using tox for testing
  > tox: Allow running with custom pytest options with {posargs}
  > gitignore: Add the default .tox directory
  > dev-requirements: Reference VM requirements
  > requirements: Add tox to dev-requirements.txt and drop pytest and flake
  > test-requirements: Rename to dev-requirements.txt
  > Add tox.ini configuration file
  > tests: commands: Consolidate the installed package/run from git tests
  > Add a pytest.ini
  > facts: targets: Drop Fedora 36 target
  > gitlab-ci.yml: Add Fedora 38 target
  > facts: targets: Add Fedora 38
  > facts: mappings: Drop 'zstd' mapping
  > facts: projects: nbdkit: Replace zstd mapping with libzstd
  > docs: mappings: Add a section on the preferred mapping naming scheme

CC: mst@redhat.com
CC: berrange@redhat.com
Signed-off-by: Ani Sinha <anisinha@redhat.com>
---
 tests/lcitool/libvirt-ci | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/lcitool/libvirt-ci b/tests/lcitool/libvirt-ci
index 85487e1404..c8971e90ac 160000
--- a/tests/lcitool/libvirt-ci
+++ b/tests/lcitool/libvirt-ci
@@ -1 +1 @@
-Subproject commit 85487e140415b2ac54b01a9a6b600fd7c21edc2f
+Subproject commit c8971e90ac169ee2b539c747f74d96c876debdf9
-- 
2.31.1

[PATCH 2/2] tests/lcitool: Add mtools and xorriso as dependency for bios bits avocado tests

[Ani Sinha]

Bios bits avocado tests need mformat (provided by the mtools package) and
xorriso tools in order to run within gitlab CI containers. Add those
dependencies within the Dockerfiles so that containers can be built with
those tools present.

CC: mst@redhat.com
CC: berrange@redhat.com
Signed-off-by: Ani Sinha <anisinha@redhat.com>
---
 .gitlab-ci.d/cirrus/freebsd-13.vars                   | 2 +-
 .gitlab-ci.d/cirrus/macos-12.vars                     | 2 +-
 tests/docker/dockerfiles/alpine.docker                | 2 ++
 tests/docker/dockerfiles/centos8.docker               | 2 ++
 tests/docker/dockerfiles/debian-amd64-cross.docker    | 2 ++
 tests/docker/dockerfiles/debian-amd64.docker          | 2 ++
 tests/docker/dockerfiles/debian-arm64-cross.docker    | 2 ++
 tests/docker/dockerfiles/debian-armel-cross.docker    | 2 ++
 tests/docker/dockerfiles/debian-armhf-cross.docker    | 2 ++
 tests/docker/dockerfiles/debian-mips64el-cross.docker | 2 ++
 tests/docker/dockerfiles/debian-mipsel-cross.docker   | 2 ++
 tests/docker/dockerfiles/debian-ppc64el-cross.docker  | 2 ++
 tests/docker/dockerfiles/debian-s390x-cross.docker    | 2 ++
 tests/docker/dockerfiles/fedora-win32-cross.docker    | 2 ++
 tests/docker/dockerfiles/fedora-win64-cross.docker    | 2 ++
 tests/docker/dockerfiles/fedora.docker                | 2 ++
 tests/docker/dockerfiles/opensuse-leap.docker         | 2 ++
 tests/docker/dockerfiles/ubuntu2004.docker            | 2 ++
 tests/docker/dockerfiles/ubuntu2204.docker            | 2 ++
 tests/lcitool/projects/qemu.yml                       | 2 ++
 20 files changed, 38 insertions(+), 2 deletions(-)

diff --git a/.gitlab-ci.d/cirrus/freebsd-13.vars b/.gitlab-ci.d/cirrus/freebsd-13.vars
index 7622c849b2..aea3a25fb3 100644
--- a/.gitlab-ci.d/cirrus/freebsd-13.vars
+++ b/.gitlab-ci.d/cirrus/freebsd-13.vars
@@ -11,6 +11,6 @@ MAKE='/usr/local/bin/gmake'
 NINJA='/usr/local/bin/ninja'
 PACKAGING_COMMAND='pkg'
 PIP3='/usr/local/bin/pip-3.8'
-PKGS='alsa-lib bash bison bzip2 ca_root_nss capstone4 ccache cdrkit-genisoimage cmocka ctags curl cyrus-sasl dbus diffutils dtc flex fusefs-libs3 gettext git glib gmake gnutls gsed gtk3 json-c libepoxy libffi libgcrypt libjpeg-turbo libnfs libslirp libspice-server libssh libtasn1 llvm lzo2 meson ncurses nettle ninja opencv pixman pkgconf png py39-numpy py39-pillow py39-pip py39-sphinx py39-sphinx_rtd_theme py39-yaml python3 rpm2cpio sdl2 sdl2_image snappy sndio socat spice-protocol tesseract usbredir virglrenderer vte3 zstd'
+PKGS='alsa-lib bash bison bzip2 ca_root_nss capstone4 ccache cdrkit-genisoimage cmocka ctags curl cyrus-sasl dbus diffutils dtc flex fusefs-libs3 gettext git glib gmake gnutls gsed gtk3 json-c libepoxy libffi libgcrypt libjpeg-turbo libnfs libslirp libspice-server libssh libtasn1 llvm lzo2 meson mtools ncurses nettle ninja opencv pixman pkgconf png py39-numpy py39-pillow py39-pip py39-sphinx py39-sphinx_rtd_theme py39-yaml python3 rpm2cpio sdl2 sdl2_image snappy sndio socat spice-protocol tesseract usbredir virglrenderer vte3 xorriso zstd'
 PYPI_PKGS=''
 PYTHON='/usr/local/bin/python3'
diff --git a/.gitlab-ci.d/cirrus/macos-12.vars b/.gitlab-ci.d/cirrus/macos-12.vars
index da6aa6469b..ceb294e153 100644
--- a/.gitlab-ci.d/cirrus/macos-12.vars
+++ b/.gitlab-ci.d/cirrus/macos-12.vars
@@ -11,6 +11,6 @@ MAKE='/opt/homebrew/bin/gmake'
 NINJA='/opt/homebrew/bin/ninja'
 PACKAGING_COMMAND='brew'
 PIP3='/opt/homebrew/bin/pip3'
-PKGS='bash bc bison bzip2 capstone ccache cmocka ctags curl dbus diffutils dtc flex gcovr gettext git glib gnu-sed gnutls gtk+3 jemalloc jpeg-turbo json-c libepoxy libffi libgcrypt libiscsi libnfs libpng libslirp libssh libtasn1 libusb llvm lzo make meson ncurses nettle ninja pixman pkg-config python3 rpm2cpio sdl2 sdl2_image snappy socat sparse spice-protocol tesseract usbredir vde vte3 zlib zstd'
+PKGS='bash bc bison bzip2 capstone ccache cmocka ctags curl dbus diffutils dtc flex gcovr gettext git glib gnu-sed gnutls gtk+3 jemalloc jpeg-turbo json-c libepoxy libffi libgcrypt libiscsi libnfs libpng libslirp libssh libtasn1 libusb llvm lzo make meson mtools ncurses nettle ninja pixman pkg-config python3 rpm2cpio sdl2 sdl2_image snappy socat sparse spice-protocol tesseract usbredir vde vte3 xorriso zlib zstd'
 PYPI_PKGS='PyYAML numpy pillow sphinx sphinx-rtd-theme'
 PYTHON='/opt/homebrew/bin/python3'
diff --git a/tests/docker/dockerfiles/alpine.docker b/tests/docker/dockerfiles/alpine.docker
index 81c70aeaf9..40ac3af096 100644
--- a/tests/docker/dockerfiles/alpine.docker
+++ b/tests/docker/dockerfiles/alpine.docker
@@ -67,6 +67,7 @@ RUN apk update && \
         make \
         mesa-dev \
         meson \
+        mtools \
         multipath-tools \
         musl-dev \
         ncurses-dev \
@@ -108,6 +109,7 @@ RUN apk update && \
         which \
         xen-dev \
         xfsprogs-dev \
+        xorriso \
         zlib-dev \
         zlib-static \
         zstd \
diff --git a/tests/docker/dockerfiles/centos8.docker b/tests/docker/dockerfiles/centos8.docker
index 1a6a9087c1..c1691ac2a3 100644
--- a/tests/docker/dockerfiles/centos8.docker
+++ b/tests/docker/dockerfiles/centos8.docker
@@ -82,6 +82,7 @@ RUN dnf distro-sync -y && \
         lzo-devel \
         make \
         mesa-libgbm-devel \
+        mtools \
         ncurses-devel \
         nettle-devel \
         ninja-build \
@@ -114,6 +115,7 @@ RUN dnf distro-sync -y && \
         vte291-devel \
         which \
         xfsprogs-devel \
+        xorriso \
         zlib-devel \
         zlib-static \
         zstd && \
diff --git a/tests/docker/dockerfiles/debian-amd64-cross.docker b/tests/docker/dockerfiles/debian-amd64-cross.docker
index 2e7eb445f1..a33d677de3 100644
--- a/tests/docker/dockerfiles/debian-amd64-cross.docker
+++ b/tests/docker/dockerfiles/debian-amd64-cross.docker
@@ -37,6 +37,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
                       locales \
                       make \
                       meson \
+                      mtools \
                       ncat \
                       ninja-build \
                       openssh-client \
@@ -57,6 +58,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
                       tar \
                       tesseract-ocr \
                       tesseract-ocr-eng \
+                      xorriso \
                       zstd && \
     eatmydata apt-get autoremove -y && \
     eatmydata apt-get autoclean -y && \
diff --git a/tests/docker/dockerfiles/debian-amd64.docker b/tests/docker/dockerfiles/debian-amd64.docker
index 28e2fa81b1..4126f66fa1 100644
--- a/tests/docker/dockerfiles/debian-amd64.docker
+++ b/tests/docker/dockerfiles/debian-amd64.docker
@@ -103,6 +103,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
                       locales \
                       make \
                       meson \
+                      mtools \
                       multipath-tools \
                       ncat \
                       nettle-dev \
@@ -127,6 +128,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
                       tesseract-ocr \
                       tesseract-ocr-eng \
                       xfslibs-dev \
+                      xorriso \
                       zlib1g-dev \
                       zstd && \
     eatmydata apt-get autoremove -y && \
diff --git a/tests/docker/dockerfiles/debian-arm64-cross.docker b/tests/docker/dockerfiles/debian-arm64-cross.docker
index f558770f84..538bcd998c 100644
--- a/tests/docker/dockerfiles/debian-arm64-cross.docker
+++ b/tests/docker/dockerfiles/debian-arm64-cross.docker
@@ -37,6 +37,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
                       locales \
                       make \
                       meson \
+                      mtools \
                       ncat \
                       ninja-build \
                       openssh-client \
@@ -57,6 +58,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
                       tar \
                       tesseract-ocr \
                       tesseract-ocr-eng \
+                      xorriso \
                       zstd && \
     eatmydata apt-get autoremove -y && \
     eatmydata apt-get autoclean -y && \
diff --git a/tests/docker/dockerfiles/debian-armel-cross.docker b/tests/docker/dockerfiles/debian-armel-cross.docker
index f3d7e07cce..37cc74d3c5 100644
--- a/tests/docker/dockerfiles/debian-armel-cross.docker
+++ b/tests/docker/dockerfiles/debian-armel-cross.docker
@@ -37,6 +37,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
                       locales \
                       make \
                       meson \
+                      mtools \
                       ncat \
                       ninja-build \
                       openssh-client \
@@ -57,6 +58,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
                       tar \
                       tesseract-ocr \
                       tesseract-ocr-eng \
+                      xorriso \
                       zstd && \
     eatmydata apt-get autoremove -y && \
     eatmydata apt-get autoclean -y && \
diff --git a/tests/docker/dockerfiles/debian-armhf-cross.docker b/tests/docker/dockerfiles/debian-armhf-cross.docker
index 531c556ad5..f423ffc136 100644
--- a/tests/docker/dockerfiles/debian-armhf-cross.docker
+++ b/tests/docker/dockerfiles/debian-armhf-cross.docker
@@ -37,6 +37,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
                       locales \
                       make \
                       meson \
+                      mtools \
                       ncat \
                       ninja-build \
                       openssh-client \
@@ -57,6 +58,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
                       tar \
                       tesseract-ocr \
                       tesseract-ocr-eng \
+                      xorriso \
                       zstd && \
     eatmydata apt-get autoremove -y && \
     eatmydata apt-get autoclean -y && \
diff --git a/tests/docker/dockerfiles/debian-mips64el-cross.docker b/tests/docker/dockerfiles/debian-mips64el-cross.docker
index 816dbd2911..90c1652135 100644
--- a/tests/docker/dockerfiles/debian-mips64el-cross.docker
+++ b/tests/docker/dockerfiles/debian-mips64el-cross.docker
@@ -37,6 +37,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
                       locales \
                       make \
                       meson \
+                      mtools \
                       ncat \
                       ninja-build \
                       openssh-client \
@@ -57,6 +58,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
                       tar \
                       tesseract-ocr \
                       tesseract-ocr-eng \
+                      xorriso \
                       zstd && \
     eatmydata apt-get autoremove -y && \
     eatmydata apt-get autoclean -y && \
diff --git a/tests/docker/dockerfiles/debian-mipsel-cross.docker b/tests/docker/dockerfiles/debian-mipsel-cross.docker
index b115b29af3..38629af0c9 100644
--- a/tests/docker/dockerfiles/debian-mipsel-cross.docker
+++ b/tests/docker/dockerfiles/debian-mipsel-cross.docker
@@ -37,6 +37,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
                       locales \
                       make \
                       meson \
+                      mtools \
                       ncat \
                       ninja-build \
                       openssh-client \
@@ -57,6 +58,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
                       tar \
                       tesseract-ocr \
                       tesseract-ocr-eng \
+                      xorriso \
                       zstd && \
     eatmydata apt-get autoremove -y && \
     eatmydata apt-get autoclean -y && \
diff --git a/tests/docker/dockerfiles/debian-ppc64el-cross.docker b/tests/docker/dockerfiles/debian-ppc64el-cross.docker
index 301bddb536..0a66dd3af2 100644
--- a/tests/docker/dockerfiles/debian-ppc64el-cross.docker
+++ b/tests/docker/dockerfiles/debian-ppc64el-cross.docker
@@ -37,6 +37,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
                       locales \
                       make \
                       meson \
+                      mtools \
                       ncat \
                       ninja-build \
                       openssh-client \
@@ -57,6 +58,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
                       tar \
                       tesseract-ocr \
                       tesseract-ocr-eng \
+                      xorriso \
                       zstd && \
     eatmydata apt-get autoremove -y && \
     eatmydata apt-get autoclean -y && \
diff --git a/tests/docker/dockerfiles/debian-s390x-cross.docker b/tests/docker/dockerfiles/debian-s390x-cross.docker
index 5d27c91c17..0f7b6ede55 100644
--- a/tests/docker/dockerfiles/debian-s390x-cross.docker
+++ b/tests/docker/dockerfiles/debian-s390x-cross.docker
@@ -37,6 +37,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
                       locales \
                       make \
                       meson \
+                      mtools \
                       ncat \
                       ninja-build \
                       openssh-client \
@@ -57,6 +58,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
                       tar \
                       tesseract-ocr \
                       tesseract-ocr-eng \
+                      xorriso \
                       zstd && \
     eatmydata apt-get autoremove -y && \
     eatmydata apt-get autoclean -y && \
diff --git a/tests/docker/dockerfiles/fedora-win32-cross.docker b/tests/docker/dockerfiles/fedora-win32-cross.docker
index e7966ec7fd..209165fd66 100644
--- a/tests/docker/dockerfiles/fedora-win32-cross.docker
+++ b/tests/docker/dockerfiles/fedora-win32-cross.docker
@@ -38,6 +38,7 @@ exec "$@"\n' > /usr/bin/nosync && \
                llvm \
                make \
                meson \
+               mtools \
                ninja-build \
                nmap-ncat \
                openssh-clients \
@@ -59,6 +60,7 @@ exec "$@"\n' > /usr/bin/nosync && \
                tesseract-langpack-eng \
                util-linux \
                which \
+               xorriso \
                zstd && \
     nosync dnf autoremove -y && \
     nosync dnf clean all -y
diff --git a/tests/docker/dockerfiles/fedora-win64-cross.docker b/tests/docker/dockerfiles/fedora-win64-cross.docker
index 86c3a8f2ac..784e3e4c2d 100644
--- a/tests/docker/dockerfiles/fedora-win64-cross.docker
+++ b/tests/docker/dockerfiles/fedora-win64-cross.docker
@@ -38,6 +38,7 @@ exec "$@"\n' > /usr/bin/nosync && \
                llvm \
                make \
                meson \
+               mtools \
                ninja-build \
                nmap-ncat \
                openssh-clients \
@@ -59,6 +60,7 @@ exec "$@"\n' > /usr/bin/nosync && \
                tesseract-langpack-eng \
                util-linux \
                which \
+               xorriso \
                zstd && \
     nosync dnf autoremove -y && \
     nosync dnf clean all -y
diff --git a/tests/docker/dockerfiles/fedora.docker b/tests/docker/dockerfiles/fedora.docker
index b698b7595d..a9ad65a76d 100644
--- a/tests/docker/dockerfiles/fedora.docker
+++ b/tests/docker/dockerfiles/fedora.docker
@@ -90,6 +90,7 @@ exec "$@"\n' > /usr/bin/nosync && \
                make \
                mesa-libgbm-devel \
                meson \
+               mtools \
                ncurses-devel \
                nettle-devel \
                ninja-build \
@@ -128,6 +129,7 @@ exec "$@"\n' > /usr/bin/nosync && \
                which \
                xen-devel \
                xfsprogs-devel \
+               xorriso \
                zlib-devel \
                zlib-static \
                zstd && \
diff --git a/tests/docker/dockerfiles/opensuse-leap.docker b/tests/docker/dockerfiles/opensuse-leap.docker
index afb9f5419f..0bc6aff53c 100644
--- a/tests/docker/dockerfiles/opensuse-leap.docker
+++ b/tests/docker/dockerfiles/opensuse-leap.docker
@@ -82,6 +82,7 @@ RUN zypper update -y && \
            lzo-devel \
            make \
            mkisofs \
+           mtools \
            ncat \
            ncurses-devel \
            ninja \
@@ -111,6 +112,7 @@ RUN zypper update -y && \
            which \
            xen-devel \
            xfsprogs-devel \
+           xorriso \
            zlib-devel \
            zlib-devel-static \
            zstd && \
diff --git a/tests/docker/dockerfiles/ubuntu2004.docker b/tests/docker/dockerfiles/ubuntu2004.docker
index aa2f5ca7b4..57b7bfe9cb 100644
--- a/tests/docker/dockerfiles/ubuntu2004.docker
+++ b/tests/docker/dockerfiles/ubuntu2004.docker
@@ -100,6 +100,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
                       llvm \
                       locales \
                       make \
+                      mtools \
                       multipath-tools \
                       ncat \
                       nettle-dev \
@@ -126,6 +127,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
                       tesseract-ocr \
                       tesseract-ocr-eng \
                       xfslibs-dev \
+                      xorriso \
                       zlib1g-dev \
                       zstd && \
     eatmydata apt-get autoremove -y && \
diff --git a/tests/docker/dockerfiles/ubuntu2204.docker b/tests/docker/dockerfiles/ubuntu2204.docker
index 3f7d30e5d0..eaba38d854 100644
--- a/tests/docker/dockerfiles/ubuntu2204.docker
+++ b/tests/docker/dockerfiles/ubuntu2204.docker
@@ -103,6 +103,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
                       locales \
                       make \
                       meson \
+                      mtools \
                       multipath-tools \
                       ncat \
                       nettle-dev \
@@ -127,6 +128,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
                       tesseract-ocr \
                       tesseract-ocr-eng \
                       xfslibs-dev \
+                      xorriso \
                       zlib1g-dev \
                       zstd && \
     eatmydata apt-get autoremove -y && \
diff --git a/tests/lcitool/projects/qemu.yml b/tests/lcitool/projects/qemu.yml
index af3700379a..924208df32 100644
--- a/tests/lcitool/projects/qemu.yml
+++ b/tests/lcitool/projects/qemu.yml
@@ -73,6 +73,7 @@ packages:
  - llvm
  - lttng-ust
  - lzo
+ - mtools
  - netcat
  - nettle
  - ninja
@@ -116,6 +117,7 @@ packages:
  - which
  - xen
  - xfsprogs
+ - xorriso
  - zstdtools
  - zlib
  - zlib-static
-- 
2.31.1

Re: [PATCH 0/2] Add mformat and xorriso dependencies in containers

[Thomas Huth]

On 03/05/2023 16.55, Ani Sinha wrote:
> mformat and xorriso tools are needed by biosbits avocado tests. This patchset
> adds those two tools in the docker container images.

tests/qtest/cdrom-test.c already uses genisoimage to create ISO images, and 
the containers already have that tool installed. Could you maybe switch the 
biosbits test to use that tool? Or the other way round? ... at least having 
two tools to create ISO images in our containers sounds IMHO excessive.

  Thomas

Re: [PATCH 0/2] Add mformat and xorriso dependencies in containers

[Ani Sinha]

> On 04-May-2023, at 12:05 PM, Thomas Huth <thuth@redhat.com> wrote:
> 
> On 03/05/2023 16.55, Ani Sinha wrote:
>> mformat and xorriso tools are needed by biosbits avocado tests. This patchset
>> adds those two tools in the docker container images.
> 
> tests/qtest/cdrom-test.c already uses genisoimage to create ISO images, and the containers already have that tool installed. Could you maybe switch the biosbits test to use that tool? Or the other way round? ... at least having two tools to create ISO images in our containers sounds IMHO excessive.

The dependency comes from the use of grub-mkrescue in the avocado test in order to generate the iso with the bios bits enabled grub and boot off with it. Grub-mkrescue is a bash script that uses mformat and xorriso. 

Re: [PATCH 0/2] Add mformat and xorriso dependencies in containers

[Thomas Huth]

On 04/05/2023 09.10, Ani Sinha wrote:
> 
> 
>> On 04-May-2023, at 12:05 PM, Thomas Huth <thuth@redhat.com> wrote:
>>
>> On 03/05/2023 16.55, Ani Sinha wrote:
>>> mformat and xorriso tools are needed by biosbits avocado tests. This patchset
>>> adds those two tools in the docker container images.
>>
>> tests/qtest/cdrom-test.c already uses genisoimage to create ISO images, and the containers already have that tool installed. Could you maybe switch the biosbits test to use that tool? Or the other way round? ... at least having two tools to create ISO images in our containers sounds IMHO excessive.
> 
> The dependency comes from the use of grub-mkrescue in the avocado test in order to generate the iso with the bios bits enabled grub and boot off with it. Grub-mkrescue is a bash script that uses mformat and xorriso.

Ok, then we could maybe try to convert the cdrom-test.c file to use xorriso 
instead?

  Thomas

Re: [PATCH 0/2] Add mformat and xorriso dependencies in containers

[Daniel P. Berrangé]

On Thu, May 04, 2023 at 08:35:53AM +0200, Thomas Huth wrote:
> On 03/05/2023 16.55, Ani Sinha wrote:
> > mformat and xorriso tools are needed by biosbits avocado tests. This patchset
> > adds those two tools in the docker container images.
> 
> tests/qtest/cdrom-test.c already uses genisoimage to create ISO images, and
> the containers already have that tool installed. Could you maybe switch the
> biosbits test to use that tool? Or the other way round? ... at least having
> two tools to create ISO images in our containers sounds IMHO excessive.

It looks like this series wasn't tested, because it doesn't even install
the alpine image:

ERROR: unable to select packages:
  cdrkit-1.1.11-r3:
    conflicts: xorriso-1.5.4-r2[cmd:mkisofs=1.1.11-r3]
    satisfies: world[cdrkit]
  xorriso-1.5.4-r2:
    conflicts: cdrkit-1.1.11-r3[cmd:mkisofs=1.5.4-r2]
    satisfies: world[xorriso]


We definitely need to have either biosbits or cdrom-test.c changed to
use the same tool. We can't be requiring deps that are conflicting at
install time.

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: [PATCH 0/2] Add mformat and xorriso dependencies in containers

[Ani Sinha]

> On 04-May-2023, at 1:32 PM, Daniel P. Berrangé <berrange@redhat.com> wrote:
> 
> On Thu, May 04, 2023 at 08:35:53AM +0200, Thomas Huth wrote:
>> On 03/05/2023 16.55, Ani Sinha wrote:
>>> mformat and xorriso tools are needed by biosbits avocado tests. This patchset
>>> adds those two tools in the docker container images.
>> 
>> tests/qtest/cdrom-test.c already uses genisoimage to create ISO images, and
>> the containers already have that tool installed. Could you maybe switch the
>> biosbits test to use that tool? Or the other way round? ... at least having
>> two tools to create ISO images in our containers sounds IMHO excessive.
> 
> It looks like this series wasn't tested,

Oh I wasn’t sure which tests I were to run to verify this because https://www.qemu.org/docs/master/devel/testing.html does not mention any specific tests to run after:

	• Once the merge request is accepted, go back to QEMU and update the tests/lcitool/libvirt-ci submodule to point to a commit that contains the mappings.yml update. Then add the prerequisite and run make lcitool-refresh.

Is it “make docker-all-tests” ? Maybe we can update the doc. This is the first time me updating the docker images with new packages and I doing not touch this infrastructure part at all.

> because it doesn't even install
> the alpine image:
> 
> ERROR: unable to select packages:
>  cdrkit-1.1.11-r3:
>    conflicts: xorriso-1.5.4-r2[cmd:mkisofs=1.1.11-r3]
>    satisfies: world[cdrkit]
>  xorriso-1.5.4-r2:
>    conflicts: cdrkit-1.1.11-r3[cmd:mkisofs=1.5.4-r2]
>    satisfies: world[xorriso]
> 
> 
> We definitely need to have either biosbits or cdrom-test.c changed to
> use the same tool.

From what I found out so far, xorriso has more fine grained options and can be run with "-as mkisofs” to generate the bootable iso. But it requires more experimentation. 

> We can't be requiring deps that are conflicting at
> install time.
> 
> 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: [PATCH 0/2] Add mformat and xorriso dependencies in containers

[Daniel P. Berrangé]

On Thu, May 04, 2023 at 01:52:36PM +0530, Ani Sinha wrote:
> 
> 
> > On 04-May-2023, at 1:32 PM, Daniel P. Berrangé <berrange@redhat.com> wrote:
> > 
> > On Thu, May 04, 2023 at 08:35:53AM +0200, Thomas Huth wrote:
> >> On 03/05/2023 16.55, Ani Sinha wrote:
> >>> mformat and xorriso tools are needed by biosbits avocado tests. This patchset
> >>> adds those two tools in the docker container images.
> >> 
> >> tests/qtest/cdrom-test.c already uses genisoimage to create ISO images, and
> >> the containers already have that tool installed. Could you maybe switch the
> >> biosbits test to use that tool? Or the other way round? ... at least having
> >> two tools to create ISO images in our containers sounds IMHO excessive.
> > 
> > It looks like this series wasn't tested,
> 
> Oh I wasn’t sure which tests I were to run to verify this because https://www.qemu.org/docs/master/devel/testing.html does not mention any specific tests to run after:
> 
> 	• Once the merge request is accepted, go back to QEMU and update the tests/lcitool/libvirt-ci submodule to point to a commit that contains the mappings.yml update. Then add the prerequisite and run make lcitool-refresh.
> 
> Is it “make docker-all-tests” ? Maybe we can update the doc. This is the first time me updating the docker images with new packages and I doing not touch this infrastructure part at all.

By testing, I mean run the CI pipeline in GitLab to see if everything
still passes. I expect the alpine job will fail the container build.

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: [PATCH 0/2] Add mformat and xorriso dependencies in containers

[Ani Sinha]

> On 04-May-2023, at 1:32 PM, Daniel P. Berrangé <berrange@redhat.com> wrote:
> 
> On Thu, May 04, 2023 at 08:35:53AM +0200, Thomas Huth wrote:
>> On 03/05/2023 16.55, Ani Sinha wrote:
>>> mformat and xorriso tools are needed by biosbits avocado tests. This patchset
>>> adds those two tools in the docker container images.
>> 
>> tests/qtest/cdrom-test.c already uses genisoimage to create ISO images, and
>> the containers already have that tool installed. Could you maybe switch the
>> biosbits test to use that tool? Or the other way round? ... at least having
>> two tools to create ISO images in our containers sounds IMHO excessive.
> 
> It looks like this series wasn't tested, because it doesn't even install
> the alpine image:
> 
> ERROR: unable to select packages:
>  cdrkit-1.1.11-r3:
>    conflicts: xorriso-1.5.4-r2[cmd:mkisofs=1.1.11-r3]
>    satisfies: world[cdrkit]
>  xorriso-1.5.4-r2:
>    conflicts: cdrkit-1.1.11-r3[cmd:mkisofs=1.5.4-r2]
>    satisfies: world[xorriso]
> 
> 
> We definitely need to have either biosbits or cdrom-test.c changed to
> use the same tool.

Wait, it seems xorriso package also provides geninsoimage?

xorriso-1.5.4-4.el9.x86_64 : ISO-9660 and Rock Ridge image manipulation tool
Repo        : @System
Matched from:
Filename    : /usr/bin/genisoimage

xorriso-1.5.4-4.el9.x86_64 : ISO-9660 and Rock Ridge image manipulation tool
Repo        : rhel-9-for-x86_64-appstream-rpms
Matched from:
Filename    : /usr/bin/genisoimage

$ rpm -ql  xorriso-1.5.4-4.el9.x86_64 | grep bin
/usr/bin/cdrecord
/usr/bin/genisoimage
/usr/bin/mkisofs
/usr/bin/osirrox
/usr/bin/wodim
/usr/bin/xorrecord
/usr/bin/xorriso
/usr/bin/xorriso-dd-target
/usr/bin/xorrisofs



> We can't be requiring deps that are conflicting at
> install time.
> 
> 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: [PATCH 0/2] Add mformat and xorriso dependencies in containers

[Daniel P. Berrangé]

On Thu, May 04, 2023 at 12:40:12PM +0530, Ani Sinha wrote:
> 
> 
> > On 04-May-2023, at 12:05 PM, Thomas Huth <thuth@redhat.com> wrote:
> > 
> > On 03/05/2023 16.55, Ani Sinha wrote:
> >> mformat and xorriso tools are needed by biosbits avocado tests. This patchset
> >> adds those two tools in the docker container images.
> > 
> > tests/qtest/cdrom-test.c already uses genisoimage to create ISO images, and the containers already have that tool installed. Could you maybe switch the biosbits test to use that tool? Or the other way round? ... at least having two tools to create ISO images in our containers sounds IMHO excessive.
> 
> The dependency comes from the use of grub-mkrescue in the avocado
> test in order to generate the iso with the bios bits enabled grub
> and boot off with it. Grub-mkrescue is a bash script that uses
> mformat and xorriso.

Where does grub-mkrescue come from ?  IIUC, we don't have a dep
on the grub package in our dockerfiles.

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: [PATCH 0/2] Add mformat and xorriso dependencies in containers

[Ani Sinha]

> On 04-May-2023, at 2:28 PM, Daniel P. Berrangé <berrange@redhat.com> wrote:
> 
> On Thu, May 04, 2023 at 12:40:12PM +0530, Ani Sinha wrote:
>> 
>> 
>>> On 04-May-2023, at 12:05 PM, Thomas Huth <thuth@redhat.com> wrote:
>>> 
>>> On 03/05/2023 16.55, Ani Sinha wrote:
>>>> mformat and xorriso tools are needed by biosbits avocado tests. This patchset
>>>> adds those two tools in the docker container images.
>>> 
>>> tests/qtest/cdrom-test.c already uses genisoimage to create ISO images, and the containers already have that tool installed. Could you maybe switch the biosbits test to use that tool? Or the other way round? ... at least having two tools to create ISO images in our containers sounds IMHO excessive.
>> 
>> The dependency comes from the use of grub-mkrescue in the avocado
>> test in order to generate the iso with the bios bits enabled grub
>> and boot off with it. Grub-mkrescue is a bash script that uses
>> mformat and xorriso.
> 
> Where does grub-mkrescue come from ?  IIUC, we don't have a dep
> on the grub package in our dockerfiles.

Bios bits runs from grub and builds grub utilities as a part of the build process which the test uses. That being said, mkrescue is just a bash script that uses those two utilities - mformat and xorriso from the docker environment. It also has some dependencies on the grub binaries generated as a part of the build process.

Re: [PATCH 0/2] Add mformat and xorriso dependencies in containers

[Ani Sinha]

> On 04-May-2023, at 2:19 PM, Ani Sinha <anisinha@redhat.com> wrote:
> 
> 
> 
>> On 04-May-2023, at 1:32 PM, Daniel P. Berrangé <berrange@redhat.com> wrote:
>> 
>> On Thu, May 04, 2023 at 08:35:53AM +0200, Thomas Huth wrote:
>>> On 03/05/2023 16.55, Ani Sinha wrote:
>>>> mformat and xorriso tools are needed by biosbits avocado tests. This patchset
>>>> adds those two tools in the docker container images.
>>> 
>>> tests/qtest/cdrom-test.c already uses genisoimage to create ISO images, and
>>> the containers already have that tool installed. Could you maybe switch the
>>> biosbits test to use that tool? Or the other way round? ... at least having
>>> two tools to create ISO images in our containers sounds IMHO excessive.
>> 
>> It looks like this series wasn't tested, because it doesn't even install
>> the alpine image:
>> 
>> ERROR: unable to select packages:
>> cdrkit-1.1.11-r3:
>>   conflicts: xorriso-1.5.4-r2[cmd:mkisofs=1.1.11-r3]
>>   satisfies: world[cdrkit]
>> xorriso-1.5.4-r2:
>>   conflicts: cdrkit-1.1.11-r3[cmd:mkisofs=1.5.4-r2]
>>   satisfies: world[xorriso]
>> 
>> 
>> We definitely need to have either biosbits or cdrom-test.c changed to
>> use the same tool.
> 
> Wait, it seems xorriso package also provides geninsoimage?
> 
> xorriso-1.5.4-4.el9.x86_64 : ISO-9660 and Rock Ridge image manipulation tool
> Repo        : @System
> Matched from:
> Filename    : /usr/bin/genisoimage
> 
> xorriso-1.5.4-4.el9.x86_64 : ISO-9660 and Rock Ridge image manipulation tool
> Repo        : rhel-9-for-x86_64-appstream-rpms
> Matched from:
> Filename    : /usr/bin/genisoimage
> 
> $ rpm -ql  xorriso-1.5.4-4.el9.x86_64 | grep bin
> /usr/bin/cdrecord
> /usr/bin/genisoimage
> /usr/bin/mkisofs
> /usr/bin/osirrox
> /usr/bin/wodim
> /usr/bin/xorrecord
> /usr/bin/xorriso
> /usr/bin/xorriso-dd-target
> /usr/bin/xorrisofs
> 

Ah

$ file /usr/bin/genisoimage
/usr/bin/genisoimage: symbolic link to /etc/alternatives/mkisofs-genisoimage
$ vi /etc/alternatives/mkisofs-genisoimage
$ file /etc/alternatives/mkisofs-genisoimage
/etc/alternatives/mkisofs-genisoimage: symbolic link to /usr/bin/xorrisofs


But the one provided by cdrkit is actually a elf binary in its own right. So if we replace genisoimage with xorriso, we need to check that the iso file for cdrom-test in a way that does not break it.

Re: [PATCH 0/2] Add mformat and xorriso dependencies in containers

[Daniel P. Berrangé]

On Thu, May 04, 2023 at 02:19:21PM +0530, Ani Sinha wrote:
> 
> 
> > On 04-May-2023, at 1:32 PM, Daniel P. Berrangé <berrange@redhat.com> wrote:
> > 
> > On Thu, May 04, 2023 at 08:35:53AM +0200, Thomas Huth wrote:
> >> On 03/05/2023 16.55, Ani Sinha wrote:
> >>> mformat and xorriso tools are needed by biosbits avocado tests. This patchset
> >>> adds those two tools in the docker container images.
> >> 
> >> tests/qtest/cdrom-test.c already uses genisoimage to create ISO images, and
> >> the containers already have that tool installed. Could you maybe switch the
> >> biosbits test to use that tool? Or the other way round? ... at least having
> >> two tools to create ISO images in our containers sounds IMHO excessive.
> > 
> > It looks like this series wasn't tested, because it doesn't even install
> > the alpine image:
> > 
> > ERROR: unable to select packages:
> >  cdrkit-1.1.11-r3:
> >    conflicts: xorriso-1.5.4-r2[cmd:mkisofs=1.1.11-r3]
> >    satisfies: world[cdrkit]
> >  xorriso-1.5.4-r2:
> >    conflicts: cdrkit-1.1.11-r3[cmd:mkisofs=1.5.4-r2]
> >    satisfies: world[xorriso]
> > 
> > 
> > We definitely need to have either biosbits or cdrom-test.c changed to
> > use the same tool.
> 
> Wait, it seems xorriso package also provides geninsoimage?
> 
> xorriso-1.5.4-4.el9.x86_64 : ISO-9660 and Rock Ridge image manipulation tool
> Repo        : @System
> Matched from:
> Filename    : /usr/bin/genisoimage
> 
> xorriso-1.5.4-4.el9.x86_64 : ISO-9660 and Rock Ridge image manipulation tool
> Repo        : rhel-9-for-x86_64-appstream-rpms
> Matched from:
> Filename    : /usr/bin/genisoimage
> 
> $ rpm -ql  xorriso-1.5.4-4.el9.x86_64 | grep bin
> /usr/bin/cdrecord
> /usr/bin/genisoimage
> /usr/bin/mkisofs
> /usr/bin/osirrox
> /usr/bin/wodim
> /usr/bin/xorrecord
> /usr/bin/xorriso
> /usr/bin/xorriso-dd-target
> /usr/bin/xorrisofs

That is not the case in Fedora.  xorriso does not provide any
genisoimage binary, that's provided by a 'genisoimage' RPM
which was created from cdrkit src RPM.

Alpine likewise has no 'genisoimage' binary provided by
xorriso.

For even more fun, xorriso is now a sub-RPM of the libisoburn
source RPM


If we could make cdrom-test  use 'mkisofs' binary then we could
likely use the xorriso package on all platforms IIUC.

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: [PATCH 0/2] Add mformat and xorriso dependencies in containers

[Thomas Huth]

On 04/05/2023 11.35, Daniel P. Berrangé wrote:
> On Thu, May 04, 2023 at 02:19:21PM +0530, Ani Sinha wrote:
>>
>>
>>> On 04-May-2023, at 1:32 PM, Daniel P. Berrangé <berrange@redhat.com> wrote:
>>>
>>> On Thu, May 04, 2023 at 08:35:53AM +0200, Thomas Huth wrote:
>>>> On 03/05/2023 16.55, Ani Sinha wrote:
>>>>> mformat and xorriso tools are needed by biosbits avocado tests. This patchset
>>>>> adds those two tools in the docker container images.
>>>>
>>>> tests/qtest/cdrom-test.c already uses genisoimage to create ISO images, and
>>>> the containers already have that tool installed. Could you maybe switch the
>>>> biosbits test to use that tool? Or the other way round? ... at least having
>>>> two tools to create ISO images in our containers sounds IMHO excessive.
>>>
>>> It looks like this series wasn't tested, because it doesn't even install
>>> the alpine image:
>>>
>>> ERROR: unable to select packages:
>>>   cdrkit-1.1.11-r3:
>>>     conflicts: xorriso-1.5.4-r2[cmd:mkisofs=1.1.11-r3]
>>>     satisfies: world[cdrkit]
>>>   xorriso-1.5.4-r2:
>>>     conflicts: cdrkit-1.1.11-r3[cmd:mkisofs=1.5.4-r2]
>>>     satisfies: world[xorriso]
>>>
>>>
>>> We definitely need to have either biosbits or cdrom-test.c changed to
>>> use the same tool.
>>
>> Wait, it seems xorriso package also provides geninsoimage?
>>
>> xorriso-1.5.4-4.el9.x86_64 : ISO-9660 and Rock Ridge image manipulation tool
>> Repo        : @System
>> Matched from:
>> Filename    : /usr/bin/genisoimage
>>
>> xorriso-1.5.4-4.el9.x86_64 : ISO-9660 and Rock Ridge image manipulation tool
>> Repo        : rhel-9-for-x86_64-appstream-rpms
>> Matched from:
>> Filename    : /usr/bin/genisoimage
>>
>> $ rpm -ql  xorriso-1.5.4-4.el9.x86_64 | grep bin
>> /usr/bin/cdrecord
>> /usr/bin/genisoimage
>> /usr/bin/mkisofs
>> /usr/bin/osirrox
>> /usr/bin/wodim
>> /usr/bin/xorrecord
>> /usr/bin/xorriso
>> /usr/bin/xorriso-dd-target
>> /usr/bin/xorrisofs
> 
> That is not the case in Fedora.  xorriso does not provide any
> genisoimage binary, that's provided by a 'genisoimage' RPM
> which was created from cdrkit src RPM.
> 
> Alpine likewise has no 'genisoimage' binary provided by
> xorriso.
> 
> For even more fun, xorriso is now a sub-RPM of the libisoburn
> source RPM
> 
> 
> If we could make cdrom-test  use 'mkisofs' binary then we could
> likely use the xorriso package on all platforms IIUC.

I assume it shoul be pretty easy to replace it in crom-test.c ... genisofs 
is a successor of the old mkisofs, so the commandd line parameter should be 
very similar or even the same.
Ani, could you add a patch to your series to replace it there?

  Thanks,
   Thomas

Re: [PATCH 0/2] Add mformat and xorriso dependencies in containers

[Ani Sinha]

> On 04-May-2023, at 1:55 PM, Daniel P. Berrangé <berrange@redhat.com> wrote:
> 
> On Thu, May 04, 2023 at 01:52:36PM +0530, Ani Sinha wrote:
>> 
>> 
>>> On 04-May-2023, at 1:32 PM, Daniel P. Berrangé <berrange@redhat.com> wrote:
>>> 
>>> On Thu, May 04, 2023 at 08:35:53AM +0200, Thomas Huth wrote:
>>>> On 03/05/2023 16.55, Ani Sinha wrote:
>>>>> mformat and xorriso tools are needed by biosbits avocado tests. This patchset
>>>>> adds those two tools in the docker container images.
>>>> 
>>>> tests/qtest/cdrom-test.c already uses genisoimage to create ISO images, and
>>>> the containers already have that tool installed. Could you maybe switch the
>>>> biosbits test to use that tool? Or the other way round? ... at least having
>>>> two tools to create ISO images in our containers sounds IMHO excessive.
>>> 
>>> It looks like this series wasn't tested,
>> 
>> Oh I wasn’t sure which tests I were to run to verify this because https://www.qemu.org/docs/master/devel/testing.html does not mention any specific tests to run after:
>> 
>> 	• Once the merge request is accepted, go back to QEMU and update the tests/lcitool/libvirt-ci submodule to point to a commit that contains the mappings.yml update. Then add the prerequisite and run make lcitool-refresh.
>> 
>> Is it “make docker-all-tests” ? Maybe we can update the doc. This is the first time me updating the docker images with new packages and I doing not touch this infrastructure part at all.
> 
> By testing, I mean run the CI pipeline in GitLab to see if everything
> still passes. I expect the alpine job will fail the container build.

Ah that makes sense. As I told you offline, I regenerated the centos8 container image in my fork with those two packages and made sure avocado-system-centos job passed. I did not run all the pipelines.

Re: [PATCH 0/2] Add mformat and xorriso dependencies in containers

[Ani Sinha]

> On 04-May-2023, at 3:43 PM, Thomas Huth <thuth@redhat.com> wrote:
> 
> On 04/05/2023 11.35, Daniel P. Berrangé wrote:
>> On Thu, May 04, 2023 at 02:19:21PM +0530, Ani Sinha wrote:
>>> 
>>> 
>>>> On 04-May-2023, at 1:32 PM, Daniel P. Berrangé <berrange@redhat.com> wrote:
>>>> 
>>>> On Thu, May 04, 2023 at 08:35:53AM +0200, Thomas Huth wrote:
>>>>> On 03/05/2023 16.55, Ani Sinha wrote:
>>>>>> mformat and xorriso tools are needed by biosbits avocado tests. This patchset
>>>>>> adds those two tools in the docker container images.
>>>>> 
>>>>> tests/qtest/cdrom-test.c already uses genisoimage to create ISO images, and
>>>>> the containers already have that tool installed. Could you maybe switch the
>>>>> biosbits test to use that tool? Or the other way round? ... at least having
>>>>> two tools to create ISO images in our containers sounds IMHO excessive.
>>>> 
>>>> It looks like this series wasn't tested, because it doesn't even install
>>>> the alpine image:
>>>> 
>>>> ERROR: unable to select packages:
>>>>  cdrkit-1.1.11-r3:
>>>>    conflicts: xorriso-1.5.4-r2[cmd:mkisofs=1.1.11-r3]
>>>>    satisfies: world[cdrkit]
>>>>  xorriso-1.5.4-r2:
>>>>    conflicts: cdrkit-1.1.11-r3[cmd:mkisofs=1.5.4-r2]
>>>>    satisfies: world[xorriso]
>>>> 
>>>> 
>>>> We definitely need to have either biosbits or cdrom-test.c changed to
>>>> use the same tool.
>>> 
>>> Wait, it seems xorriso package also provides geninsoimage?
>>> 
>>> xorriso-1.5.4-4.el9.x86_64 : ISO-9660 and Rock Ridge image manipulation tool
>>> Repo        : @System
>>> Matched from:
>>> Filename    : /usr/bin/genisoimage
>>> 
>>> xorriso-1.5.4-4.el9.x86_64 : ISO-9660 and Rock Ridge image manipulation tool
>>> Repo        : rhel-9-for-x86_64-appstream-rpms
>>> Matched from:
>>> Filename    : /usr/bin/genisoimage
>>> 
>>> $ rpm -ql  xorriso-1.5.4-4.el9.x86_64 | grep bin
>>> /usr/bin/cdrecord
>>> /usr/bin/genisoimage
>>> /usr/bin/mkisofs
>>> /usr/bin/osirrox
>>> /usr/bin/wodim
>>> /usr/bin/xorrecord
>>> /usr/bin/xorriso
>>> /usr/bin/xorriso-dd-target
>>> /usr/bin/xorrisofs
>> That is not the case in Fedora.  xorriso does not provide any
>> genisoimage binary, that's provided by a 'genisoimage' RPM
>> which was created from cdrkit src RPM.
>> Alpine likewise has no 'genisoimage' binary provided by
>> xorriso.
>> For even more fun, xorriso is now a sub-RPM of the libisoburn
>> source RPM
>> If we could make cdrom-test  use 'mkisofs' binary then we could
>> likely use the xorriso package on all platforms IIUC.
> 
> I assume it shoul be pretty easy to replace it in crom-test.c ... genisofs is a successor of the old mkisofs, so the commandd line parameter should be very similar or even the same.

In my RHEL 9 box, funny that cdrom-test is actually using xorriso even today since genisoimage is eventually a symlink to xorriso and it works just fine :

$ QTEST_QEMU_BINARY=./qemu-system-x86_64 ./tests/qtest/cdrom-test
# random seed: R02S8027650089f37c7be48a579c1b3bdeaa
xorriso 1.5.4 : RockRidge filesystem manipulator, libburnia project.

xorriso 1.5.4
ISO 9660 Rock Ridge filesystem manipulator and CD/DVD/BD burn program
Copyright (C) 2019, Thomas Schmitt <scdbackup@gmx.net>, libburnia project.
xorriso version   :  1.5.4
Version timestamp :  2021.01.30.150001
Build timestamp   :  -none-given-
libisofs   in use :  1.5.4  (min. 1.5.4)
libburn    in use :  1.5.4  (min. 1.5.4)
libburn OS adapter:  internal GNU/Linux SG_IO adapter sg-linux
libisoburn in use :  1.5.4  (min. 1.5.4)
Provided under GNU GPL version 3 or later, due to libreadline license.
There is NO WARRANTY, to the extent permitted by law.
xorriso 1.5.4 : RockRidge filesystem manipulator, libburnia project.

> Ani, could you add a patch to your series to replace it there?

Just sent the updated patch. Yes replacing genisoimage with xorrisfs is good enough. Exact same arguments work just fine.