From 7a298c838b81a93dc40dca53e4754bb21ddf4caf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Budai?= <ondrej@budai.cz>
Date: Tue, 27 Jul 2021 12:31:53 +0200
Subject: [PATCH] tests: remove all disabling conditions for RHEL 9.0
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

RHEL 9.0 isn't yet in .gitlab-ci.yml so this actually doesn't change in test
runs but it should make enabling of the tests easier.

Signed-off-by: Ondřej Budai <ondrej@budai.cz>
---
 test/cases/api.sh     | 6 ------
 test/cases/aws.sh     | 6 ------
 test/cases/azure.sh   | 6 ------
 test/cases/libvirt.sh | 5 +----
 4 files changed, 1 insertion(+), 22 deletions(-)

diff --git a/test/cases/api.sh b/test/cases/api.sh
index 4b6aa0a55..d80166738 100755
--- a/test/cases/api.sh
+++ b/test/cases/api.sh
@@ -20,12 +20,6 @@ mkdir -p "${ARTIFACTS}"
 source /etc/os-release
 DISTRO_CODE="${DISTRO_CODE:-${ID}_${VERSION_ID//./}}"
 
-#TODO: remove this once there is rhel9 support for necessary image types
-if [[ $DISTRO_CODE == rhel_90 ]]; then
-    echo "Skipped"
-    exit 0
-fi
-
 #
 # Provision the software under test.
 #
diff --git a/test/cases/aws.sh b/test/cases/aws.sh
index 88d0184d9..59b392e32 100755
--- a/test/cases/aws.sh
+++ b/test/cases/aws.sh
@@ -9,12 +9,6 @@ function greenprint {
     echo -e "\033[1;32m${1}\033[0m"
 }
 
-#TODO: Remove this once there is rhel9 support for AMI image type
-if [[ $DISTRO_CODE == rhel_90 ]]; then
-    greenprint "Skipped"
-    exit 0
-fi
-
 # Provision the software under test.
 /usr/libexec/osbuild-composer-test/provision.sh
 
diff --git a/test/cases/azure.sh b/test/cases/azure.sh
index bb283d279..b7acdb8ac 100755
--- a/test/cases/azure.sh
+++ b/test/cases/azure.sh
@@ -12,12 +12,6 @@ function greenprint {
     echo -e "\033[1;32m${1}\033[0m"
 }
 
-#TODO: Remove this once there is rhel9 support for Azure image type
-if [[ $DISTRO_CODE == rhel_90 ]]; then
-    greenprint "Skipped"
-    exit 0
-fi
-
 # Provision the software under test.
 /usr/libexec/osbuild-composer-test/provision.sh
 
diff --git a/test/cases/libvirt.sh b/test/cases/libvirt.sh
index d75158d09..84b151493 100644
--- a/test/cases/libvirt.sh
+++ b/test/cases/libvirt.sh
@@ -11,10 +11,7 @@ DISTRO_CODE="${DISTRO_CODE:-${ID}_${VERSION_ID//./}}"
 # Test the images
 /usr/libexec/osbuild-composer-test/libvirt_test.sh qcow2
 
-#TODO: remove this condition once there is rhel9 support for openstack and vhd image types
-if [[ "$DISTRO_CODE" != rhel_90 ]]; then
-  /usr/libexec/osbuild-composer-test/libvirt_test.sh openstack
-fi
+/usr/libexec/osbuild-composer-test/libvirt_test.sh openstack
 
 # RHEL 8.4 and Centos Stream 8 images also supports uefi, check that
 if [[ "$DISTRO_CODE" == "rhel_84" || "$DISTRO_CODE" == "rhel_85" || "$DISTRO_CODE" == "centos_8"  || "$DISTRO_CODE" == "rhel_90" ]]; then