From 3fb55413dc0f41aac9b2a0c90cdca8ed2d56fb9b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Budai?= <ondrej@budai.cz>
Date: Tue, 6 Jun 2023 13:38:31 +0200
Subject: [PATCH] test/cases: make fedora conditions generic for all versions
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

To save us some work when updating the tests.

Signed-off-by: Ondřej Budai <ondrej@budai.cz>
---
 test/cases/minimal-raw.sh | 16 ++++++----------
 test/cases/ostree-ng.sh   | 12 +-----------
 test/cases/ostree.sh      | 17 +++--------------
 3 files changed, 10 insertions(+), 35 deletions(-)

diff --git a/test/cases/minimal-raw.sh b/test/cases/minimal-raw.sh
index 2b00de328..9aa61f664 100755
--- a/test/cases/minimal-raw.sh
+++ b/test/cases/minimal-raw.sh
@@ -73,16 +73,12 @@ SSH_KEY=${SSH_DATA_DIR}/id_rsa
 SSH_KEY_PUB=$(cat "${SSH_KEY}".pub)
 EDGE_USER_PASSWORD=foobar
 
-case "${ID}-${VERSION_ID}" in
-    "fedora-37")
-        # CI runner does not support fedora37 os name in this case
-        # ERROR    Unknown OS name 'fedora37'. See `--osinfo list` for valid values.
-        OS_VARIANT="fedora-unknown"
-        ;;
-    *)
-        echo "unsupported distro: ${ID}-${VERSION_ID}"
-        exit 1;;
-esac
+if [[ $ID != fedora ]]; then
+    echo "unsupported distro: ${ID}-${VERSION_ID}"
+    exit 1
+fi
+
+OS_VARIANT="fedora-unknown"
 
 # Get the compose log.
 get_compose_log () {
diff --git a/test/cases/ostree-ng.sh b/test/cases/ostree-ng.sh
index f19d5af21..1eda981f8 100755
--- a/test/cases/ostree-ng.sh
+++ b/test/cases/ostree-ng.sh
@@ -106,17 +106,7 @@ KERNEL_RT_PKG="kernel-rt"
 SYSROOT_RO="false"
 
 case "${ID}-${VERSION_ID}" in
-    "fedora-37")
-        CONTAINER_TYPE=iot-container
-        INSTALLER_TYPE=iot-installer
-        OSTREE_REF="fedora/${VERSION_ID}/${ARCH}/iot"
-        OSTREE_OSNAME=fedora
-        OS_VARIANT="fedora-unknown"
-        EMBEDED_CONTAINER="false"
-        DIRS_FILES_CUSTOMIZATION="true"
-        SYSROOT_RO="true"
-        ;;
-    "fedora-38")
+    fedora-*)
         CONTAINER_TYPE=iot-container
         INSTALLER_TYPE=iot-installer
         OSTREE_REF="fedora/${VERSION_ID}/${ARCH}/iot"
diff --git a/test/cases/ostree.sh b/test/cases/ostree.sh
index b7efa600a..a74f370a3 100755
--- a/test/cases/ostree.sh
+++ b/test/cases/ostree.sh
@@ -19,23 +19,12 @@ SYSROOT_RO="false"
 
 # Set os-variant and boot location used by virt-install.
 case "${ID}-${VERSION_ID}" in
-    "fedora-37")
+    fedora-*)
         IMAGE_TYPE=iot-commit
-        OSTREE_REF="fedora/37/${ARCH}/iot"
+        OSTREE_REF="fedora/${VERSION_ID}/${ARCH}/iot"
         OS_VARIANT="fedora-unknown"
         USER_IN_COMMIT="false"
-        BOOT_LOCATION="https://mirrors.kernel.org/fedora/releases/37/Everything/x86_64/os/"
-        EMBEDED_CONTAINER="false"
-        FIREWALL_FEATURE="false"
-        DIRS_FILES_CUSTOMIZATION="true"
-        SYSROOT_RO="true"
-        ;;
-    "fedora-38")
-        IMAGE_TYPE=iot-commit
-        OSTREE_REF="fedora/38/${ARCH}/iot"
-        OS_VARIANT="fedora-unknown"
-        USER_IN_COMMIT="false"
-        BOOT_LOCATION="https://mirrors.kernel.org/fedora/releases/38/Everything/x86_64/os/"
+        BOOT_LOCATION="https://mirrors.kernel.org/fedora/releases/${VERSION_ID}/Everything/x86_64/os/"
         EMBEDED_CONTAINER="false"
         FIREWALL_FEATURE="false"
         DIRS_FILES_CUSTOMIZATION="true"