test: replace genisoimage with mkisofs

genisoimage might be removed from RHEL 9. The users are advised to switch
to mkisofs tools from the xorriso package. It should be a drop-in replacement.

The same change was recently done by libguestfs:

efb8a766ca
2216ab2e32

Signed-off-by: Ondřej Budai <ondrej@budai.cz>
This commit is contained in:
Ondřej Budai 2021-03-31 13:06:46 +02:00 committed by Ondřej Budai
parent 6ed4c59010
commit 54a458af5c
5 changed files with 5 additions and 5 deletions

View file

@ -75,7 +75,7 @@ func withTempDir(dir, pattern string, f func(dir string) error) error {
// metaData and writes it to the writer
func writeCloudInitISO(writer io.Writer, userData, metaData string) error {
isoCmd := exec.Command(
"genisoimage",
"mkisofs",
"-quiet",
"-input-charset", "utf-8",
"-volid", "cidata",

View file

@ -311,7 +311,7 @@ Summary: Integration tests
Requires: %{name} = %{version}-%{release}
Requires: composer-cli
Requires: createrepo_c
Requires: genisoimage
Requires: xorriso
Requires: qemu-kvm-core
Requires: systemd-container
Requires: jq

View file

@ -44,7 +44,7 @@ echo -e "instance-id: nocloud\nlocal-hostname: vm\n" > "$workdir/cidata/meta-dat
case $(uname -s) in
"Linux")
genisoimage \
mkisofs \
-input-charset utf-8 \
-output "$workdir/cloudinit.iso" \
-volid cidata \

View file

@ -228,7 +228,7 @@ greenprint "💿 Creating a cloud-init ISO"
CLOUD_INIT_PATH=/var/lib/libvirt/images/seed.iso
rm -f $CLOUD_INIT_PATH
pushd "$CLOUD_INIT_DIR"
sudo genisoimage -o $CLOUD_INIT_PATH -V cidata \
sudo mkisofs -o $CLOUD_INIT_PATH -V cidata \
-r -J user-data meta-data network-config > /dev/null 2>&1
popd

View file

@ -437,7 +437,7 @@ class BaseRunner(contextlib.AbstractContextManager):
if sysname == "Linux":
subprocess.check_call(
[
"genisoimage",
"mkisofs",
"-input-charset", "utf-8",
"-output", iso_path,
"-volid", "cidata",