From 967570a2a6ce619e3a73efc09c2f1f9f184c1781 Mon Sep 17 00:00:00 2001
From: Xiaofeng Wang <henrywangxf@me.com>
Date: Wed, 26 Jul 2023 15:34:25 +0800
Subject: [PATCH] test: Add workaround for BZ#2213660 and #2225667

---
 test/cases/installers.sh                  | 7 +++++++
 test/cases/minimal-raw.sh                 | 7 +++++++
 test/cases/oscap.sh                       | 7 +++++++
 test/cases/ostree-ignition.sh             | 7 +++++++
 test/cases/ostree-ng.sh                   | 6 ++++++
 test/cases/ostree-raw-image.sh            | 6 ++++++
 test/cases/ostree-simplified-installer.sh | 7 +++++++
 test/cases/ostree.sh                      | 6 ++++++
 tools/libvirt_test.sh                     | 7 +++++++
 9 files changed, 60 insertions(+)

diff --git a/test/cases/installers.sh b/test/cases/installers.sh
index 53e7c4b85..31086d1ab 100755
--- a/test/cases/installers.sh
+++ b/test/cases/installers.sh
@@ -71,6 +71,13 @@ EOFKS
     echo "============================"
 }
 
+# workaround for bug https://bugzilla.redhat.com/show_bug.cgi?id=2213660
+if [[ "$VERSION_ID" == "9.3"  || "$VERSION_ID" == "9" ]]; then
+    sudo tee /etc/sysconfig/libvirtd << EOF > /dev/null
+LIBVIRTD_ARGS=
+EOF
+fi
+
 # Start libvirtd and test it.
 greenprint "🚀 Starting libvirt daemon"
 sudo systemctl start libvirtd
diff --git a/test/cases/minimal-raw.sh b/test/cases/minimal-raw.sh
index 03da4531f..714d3a181 100755
--- a/test/cases/minimal-raw.sh
+++ b/test/cases/minimal-raw.sh
@@ -8,6 +8,13 @@ source /usr/libexec/tests/osbuild-composer/shared_lib.sh
 # Provision the software under test.
 /usr/libexec/osbuild-composer-test/provision.sh none
 
+# workaround for bug https://bugzilla.redhat.com/show_bug.cgi?id=2213660
+if [[ "$VERSION_ID" == "9.3"  || "$VERSION_ID" == "9" ]]; then
+    sudo tee /etc/sysconfig/libvirtd << EOF > /dev/null
+LIBVIRTD_ARGS=
+EOF
+fi
+
 # Start firewalld
 greenprint "Start firewalld"
 sudo systemctl enable --now firewalld
diff --git a/test/cases/oscap.sh b/test/cases/oscap.sh
index 7ce92a861..d242d09a3 100755
--- a/test/cases/oscap.sh
+++ b/test/cases/oscap.sh
@@ -11,6 +11,13 @@ source /etc/os-release
 
 source /usr/libexec/tests/osbuild-composer/shared_lib.sh
 
+# workaround for bug https://bugzilla.redhat.com/show_bug.cgi?id=2213660
+if [[ "$VERSION_ID" == "9.3"  || "$VERSION_ID" == "9" ]]; then
+    sudo tee /etc/sysconfig/libvirtd << EOF > /dev/null
+LIBVIRTD_ARGS=
+EOF
+fi
+
 # Start libvirtd and test it.
 greenprint "🚀 Starting libvirt daemon"
 sudo systemctl start libvirtd
diff --git a/test/cases/ostree-ignition.sh b/test/cases/ostree-ignition.sh
index bd515a66e..e3114e1a5 100755
--- a/test/cases/ostree-ignition.sh
+++ b/test/cases/ostree-ignition.sh
@@ -10,6 +10,13 @@ ARCH=$(uname -m)
 
 source /usr/libexec/tests/osbuild-composer/shared_lib.sh
 
+# workaround for bug https://bugzilla.redhat.com/show_bug.cgi?id=2213660
+if [[ "$VERSION_ID" == "9.3"  || "$VERSION_ID" == "9" ]]; then
+    sudo tee /etc/sysconfig/libvirtd << EOF > /dev/null
+LIBVIRTD_ARGS=
+EOF
+fi
+
 # Install and start firewalld
 greenprint "🔧 Install and start firewalld"
 sudo dnf install -y firewalld
diff --git a/test/cases/ostree-ng.sh b/test/cases/ostree-ng.sh
index e4a0083d4..870ecf8a9 100755
--- a/test/cases/ostree-ng.sh
+++ b/test/cases/ostree-ng.sh
@@ -8,6 +8,12 @@ set -euo pipefail
 source /usr/libexec/osbuild-composer-test/set-env-variables.sh
 source /usr/libexec/tests/osbuild-composer/shared_lib.sh
 
+# workaround for bug https://bugzilla.redhat.com/show_bug.cgi?id=2213660
+if [[ "$VERSION_ID" == "9.3"  || "$VERSION_ID" == "9" ]]; then
+    sudo tee /etc/sysconfig/libvirtd << EOF > /dev/null
+LIBVIRTD_ARGS=
+EOF
+fi
 
 # Install openshift client
 greenprint "🔧 Installing oenshift client(oc)"
diff --git a/test/cases/ostree-raw-image.sh b/test/cases/ostree-raw-image.sh
index 60c743573..4f71dcfa8 100755
--- a/test/cases/ostree-raw-image.sh
+++ b/test/cases/ostree-raw-image.sh
@@ -10,6 +10,12 @@ source /usr/libexec/tests/osbuild-composer/shared_lib.sh
 source /etc/os-release
 ARCH=$(uname -m)
 
+# workaround for bug https://bugzilla.redhat.com/show_bug.cgi?id=2213660
+if [[ "$VERSION_ID" == "9.3"  || "$VERSION_ID" == "9" ]]; then
+    sudo tee /etc/sysconfig/libvirtd << EOF > /dev/null
+LIBVIRTD_ARGS=
+EOF
+fi
 
 # Start libvirtd and test it.
 greenprint "🚀 Starting libvirt daemon"
diff --git a/test/cases/ostree-simplified-installer.sh b/test/cases/ostree-simplified-installer.sh
index bf98decb8..dd1a82416 100755
--- a/test/cases/ostree-simplified-installer.sh
+++ b/test/cases/ostree-simplified-installer.sh
@@ -27,6 +27,13 @@ done
 sudo /usr/local/bin/yq -iy '.service_info.diskencryption_clevis |= [{disk_label: "/dev/vda4", reencrypt: true, binding: {pin: "tpm2", config: "{}"}}]' /etc/fdo/aio/configs/serviceinfo_api_server.yml
 sudo systemctl restart fdo-aio
 
+# workaround for bug https://bugzilla.redhat.com/show_bug.cgi?id=2213660
+if [[ "$VERSION_ID" == "9.3"  || "$VERSION_ID" == "9" ]]; then
+    sudo tee /etc/sysconfig/libvirtd << EOF > /dev/null
+LIBVIRTD_ARGS=
+EOF
+fi
+
 # Start libvirtd and test it.
 greenprint "🚀 Starting libvirt daemon"
 sudo systemctl start libvirtd
diff --git a/test/cases/ostree.sh b/test/cases/ostree.sh
index 4d3f0a488..1a4733ec6 100755
--- a/test/cases/ostree.sh
+++ b/test/cases/ostree.sh
@@ -150,6 +150,12 @@ case "${ID}-${VERSION_ID}" in
         exit 1;;
 esac
 
+# workaround for bug https://bugzilla.redhat.com/show_bug.cgi?id=2213660
+if [[ "$VERSION_ID" == "9.3"  || "$VERSION_ID" == "9" ]]; then
+    sudo tee /etc/sysconfig/libvirtd << EOF > /dev/null
+LIBVIRTD_ARGS=
+EOF
+fi
 
 # Start libvirtd and test it.
 greenprint "🚀 Starting libvirt daemon"
diff --git a/tools/libvirt_test.sh b/tools/libvirt_test.sh
index 46eb92106..3e9b76b41 100755
--- a/tools/libvirt_test.sh
+++ b/tools/libvirt_test.sh
@@ -34,6 +34,13 @@ function greenprint {
     echo -e "\033[1;32m[$(date -Isecond)] ${1}\033[0m"
 }
 
+# workaround for bug https://bugzilla.redhat.com/show_bug.cgi?id=2213660
+if [[ "$VERSION_ID" == "9.3"  || "$VERSION_ID" == "9" ]]; then
+    sudo tee /etc/sysconfig/libvirtd << EOF > /dev/null
+LIBVIRTD_ARGS=
+EOF
+fi
+
 # Start libvirtd and test it.
 greenprint "🚀 Starting libvirt daemon"
 sudo systemctl start libvirtd