OSDN Git Service

tests/lcitool: Add mtools and xorriso and remove genisoimage as dependencies
authorAni Sinha <anisinha@redhat.com>
Thu, 4 May 2023 15:46:11 +0000 (21:16 +0530)
committerThomas Huth <thuth@redhat.com>
Tue, 16 May 2023 07:14:18 +0000 (09:14 +0200)
commitda9000784c90d2b645eedaa865b5cf778cb4d37f
tree6cc5733968de61db6a54452647dd22d0fd166e1a
parenta19b119bd79f2c4b521c5969c9ffdabd0b6b546b
tests/lcitool: Add mtools and xorriso and remove genisoimage as dependencies

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 and bios bits avocado tests can be run there.

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.

Signed-off-by: Ani Sinha <anisinha@redhat.com>
Message-Id: <20230504154611.85854-3-anisinha@redhat.com>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>
21 files changed:
.gitlab-ci.d/cirrus/freebsd-13.vars
.gitlab-ci.d/cirrus/macos-12.vars
tests/docker/dockerfiles/alpine.docker
tests/docker/dockerfiles/centos8.docker
tests/docker/dockerfiles/debian-amd64-cross.docker
tests/docker/dockerfiles/debian-amd64.docker
tests/docker/dockerfiles/debian-arm64-cross.docker
tests/docker/dockerfiles/debian-armel-cross.docker
tests/docker/dockerfiles/debian-armhf-cross.docker
tests/docker/dockerfiles/debian-mips64el-cross.docker
tests/docker/dockerfiles/debian-mipsel-cross.docker
tests/docker/dockerfiles/debian-ppc64el-cross.docker
tests/docker/dockerfiles/debian-s390x-cross.docker
tests/docker/dockerfiles/fedora-win32-cross.docker
tests/docker/dockerfiles/fedora-win64-cross.docker
tests/docker/dockerfiles/fedora.docker
tests/docker/dockerfiles/opensuse-leap.docker
tests/docker/dockerfiles/ubuntu2004.docker
tests/docker/dockerfiles/ubuntu2204.docker
tests/lcitool/projects/qemu.yml
tests/qtest/cdrom-test.c