diff --git a/test/cases/installers.sh b/test/cases/installers.sh index 9d81326fa..747a27ec2 100755 --- a/test/cases/installers.sh +++ b/test/cases/installers.sh @@ -71,13 +71,6 @@ 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 999934a50..4c46df4cb 100755 --- a/test/cases/minimal-raw.sh +++ b/test/cases/minimal-raw.sh @@ -8,13 +8,6 @@ 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 8044f070f..e5bd7459f 100755 --- a/test/cases/oscap.sh +++ b/test/cases/oscap.sh @@ -11,13 +11,6 @@ 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 852880edb..82df2e91b 100755 --- a/test/cases/ostree-ignition.sh +++ b/test/cases/ostree-ignition.sh @@ -10,13 +10,6 @@ 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 27fc3d436..9fa579a0c 100755 --- a/test/cases/ostree-ng.sh +++ b/test/cases/ostree-ng.sh @@ -10,13 +10,6 @@ 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 openshift client greenprint "🔧 Installing oenshift client(oc)" curl https://osbuild-storage.s3.amazonaws.com/oc-4.9.0-linux.tar.gz | sudo tar -xz -C /usr/local/bin/ diff --git a/test/cases/ostree-pulp.sh b/test/cases/ostree-pulp.sh index 07f80a451..9939277a6 100644 --- a/test/cases/ostree-pulp.sh +++ b/test/cases/ostree-pulp.sh @@ -32,13 +32,6 @@ 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" sudo systemctl start libvirtd diff --git a/test/cases/ostree-raw-image.sh b/test/cases/ostree-raw-image.sh index 1cae96344..e639bd276 100755 --- a/test/cases/ostree-raw-image.sh +++ b/test/cases/ostree-raw-image.sh @@ -10,13 +10,6 @@ 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 - # Start libvirtd and test it. greenprint "🚀 Starting libvirt daemon" sudo systemctl start libvirtd diff --git a/test/cases/ostree-simplified-installer.sh b/test/cases/ostree-simplified-installer.sh index c8ef49fa6..d193bf3c1 100755 --- a/test/cases/ostree-simplified-installer.sh +++ b/test/cases/ostree-simplified-installer.sh @@ -33,13 +33,6 @@ if [[ "$VERSION_ID" == "9.4" || "$VERSION_ID" == "9" ]]; then fi 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 be7b15039..b75ba17fa 100755 --- a/test/cases/ostree.sh +++ b/test/cases/ostree.sh @@ -90,13 +90,6 @@ 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" sudo systemctl start libvirtd diff --git a/tools/libvirt_test.sh b/tools/libvirt_test.sh index 3e9b76b41..46eb92106 100755 --- a/tools/libvirt_test.sh +++ b/tools/libvirt_test.sh @@ -34,13 +34,6 @@ 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