From 4e0507bac1958ea7c9bbdaeec652fe2e78f3808b Mon Sep 17 00:00:00 2001
From: Al Bowles <bowlesalx@gmail.com>
Date: Fri, 14 Oct 2022 19:28:29 -0500
Subject: [PATCH] Updates for 9.0 support and usability

- Add automatic ISO filename switching based on major version
- Update usage information to include package-set
- Automatically reload FIF templates prior to test run
- Update build name to display chronologically on openQA landing page
---
 run-openqa-tests.sh | 36 ++++++++++++++++++++++++------------
 1 file changed, 24 insertions(+), 12 deletions(-)

diff --git a/run-openqa-tests.sh b/run-openqa-tests.sh
index 1b2d0cbc..f6b02722 100755
--- a/run-openqa-tests.sh
+++ b/run-openqa-tests.sh
@@ -1,36 +1,48 @@
 #!/bin/bash
-
 set -e
 
+MAJOR_VERSION=8
+MINOR_VERSION=6
+
 ROCKY_FLAVOR="${ROCKY_FLAVOR:-boot-iso}"
-ROCKY_VERSION="${ROCKY_VERSION:-8.6}"
+ROCKY_VERSION="$MAJOR_VERSION.$MINOR_VERSION"
 ROCKY_ARCH="${ROCKY_ARCH:=x86_64}"
-ROCKY_PACKAGE_SET="${ROCKY_PACKAGE_SET:=minimal}"
 ROCKY_EXTRA_ARGS="${ROCKY_EXTRA_ARGS:-}"
-BUILD_PREFIX="${ROCKY_VERSION}_${ROCKY_FLAVOR}"
-BUILD_NAME="${BUILD_PREFIX}_$(date +%Y%m%d.%H%M%S).0"
+BUILD_PREFIX="-$(date +%Y%m%d.%H%M%S).0-$(git branch --show-current)"
+BUILD_NAME="$BUILD_PREFIX-$ROCKY_FLAVOR-$ROCKY_VERSION"
+
+ISO_PREFIX="Rocky-$ROCKY_VERSION-$ROCKY_ARCH"
 
 if [[ "$ROCKY_FLAVOR" == "dvd-iso" || "$ROCKY_FLAVOR" == "universal" ]]; then
-    ISO_TYPE=dvd1
+    if [[ "$MAJOR_VERSION" -gt "8" ]]; then
+        ISO_TYPE=dvd
+    else
+        ISO_TYPE=dvd1
+    fi
 elif [[ "$ROCKY_FLAVOR" == "minimal-iso" ]]; then
     ISO_TYPE=minimal
-elif [[ "$ROCKY_FLAVOR" == "boot-iso" ]]; then
+elif [[ "$ROCKY_FLAVOR" == "boot-iso" || "$ROCKY_FLAVOR" == "package-set" ]]; then
+    # package-set also works with dvd image
     ISO_TYPE=boot
 else
-    echo "Usage: $0 [universal|dvd-iso|minimal-iso|boot-iso]"
+    echo "Usage: $0 [universal|dvd-iso|minimal-iso|package-set|boot-iso]"
     exit 1
 fi
 
+ROCKY_ISO="$ISO_PREFIX-$ISO_TYPE.iso"
+
+# Update fif templates
+./fifloader.py --clean --load templates.fif.json templates-updates.fif.json
+
+# Run the tests
 export PS4='# '
 set -o xtrace
 openqa-cli api \
     -X POST isos \
-    ISO="Rocky-$ROCKY_VERSION-$ROCKY_ARCH-$ISO_TYPE.iso" \
+    ISO="$ROCKY_ISO" \
     ARCH="$ROCKY_ARCH" \
     DISTRI=rocky \
     FLAVOR="$ROCKY_FLAVOR" \
     VERSION="$ROCKY_VERSION" \
     BUILD="$BUILD_NAME" \
-    PACKAGE_SET="$ROCKY_PACKAGE_SET" \
-    IDENTIFICATION=false \
-    "${ROCKY_EXTRA_ARGS}"
+    "$ROCKY_EXTRA_ARGS"