From 1e53d13cfefcb9feffc9bfb5e447e5084ccce009 Mon Sep 17 00:00:00 2001
From: Al Bowles <bowlesalx@gmail.com>
Date: Thu, 11 May 2023 20:35:00 -0500
Subject: [PATCH 1/2] Consolidate build names for all flavors by version

This PR neither adds nor updates specific test functionality, but does
update the wrapper scripts based on @tcooper's recommendations for
consolidating all flavors for a particular version into a single build.
---
 scripts/run-all-flavors.sh  | 32 +++++++++++++++++---------------
 scripts/run-openqa-tests.sh | 12 +++++-------
 2 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/scripts/run-all-flavors.sh b/scripts/run-all-flavors.sh
index fc12e8d7..becb564d 100755
--- a/scripts/run-all-flavors.sh
+++ b/scripts/run-all-flavors.sh
@@ -1,16 +1,18 @@
 #!/bin/bash
 set -e
 
-MAJOR_VERSION=9
-MINOR_VERSION=0
-
 ## Usage: Posts ISOs to openQA for each of the universal, dvd-iso, package-set, minimal-iso, and boot-iso FLAVORs.
 # scripts/run-all-flavors.sh
+# Test a beta build with alternative repo URL
+#   ROCKY_EXTRA_ARGS="GRUB=ip=dhcp GRUBADD=inst.repo=https://dl.rockylinux.org/stg/rocky/8.8-BETA/BaseOS/x86_64/os DNF_CONTENTDIR=stg CURRREL=8 IDENTIFICATION=false" scripts/run-all-flavors.sh
 
-ROCKY_VERSION="$MAJOR_VERSION.$MINOR_VERSION"
+ROCKY_VERSION="9.2"
+
+MAJOR_VERSION=$(awk -F '.' '{print $1}' <<< $ROCKY_VERSION)
+MINOR_VERSION=$(awk -F '.' '{print $2}' <<< $ROCKY_VERSION)
 ROCKY_ARCH="${ROCKY_ARCH:=x86_64}"
 ROCKY_EXTRA_ARGS="${ROCKY_EXTRA_ARGS:-}"
-BUILD_PREFIX="-$(date +%Y%m%d.%H%M%S).0-$(git branch --show-current)"
+BUILD_NAME="-$(date +%Y%m%d).0-$(git branch --show-current)-$ROCKY_VERSION"
 ISO_PREFIX="Rocky-$ROCKY_VERSION-$ROCKY_ARCH"
 DVD_ISOTYPE=dvd1
 
@@ -31,8 +33,8 @@ openqa-cli api \
     DISTRI=rocky \
     FLAVOR=universal \
     VERSION="$ROCKY_VERSION" \
-    BUILD="$BUILD_PREFIX-universal-$ROCKY_VERSION" \
-    "${ROCKY_EXTRA_ARGS}"
+    BUILD="$BUILD_NAME" \
+    ${ROCKY_EXTRA_ARGS}
 
 openqa-cli api \
     -X POST isos \
@@ -41,8 +43,8 @@ openqa-cli api \
     DISTRI=rocky \
     FLAVOR="dvd-iso" \
     VERSION="$ROCKY_VERSION" \
-    BUILD="$BUILD_PREFIX-dvd-$ROCKY_VERSION" \
-    "${ROCKY_EXTRA_ARGS}"
+    BUILD="$BUILD_NAME" \
+    ${ROCKY_EXTRA_ARGS}
 
 openqa-cli api \
     -X POST isos \
@@ -51,8 +53,8 @@ openqa-cli api \
     DISTRI=rocky \
     FLAVOR=package-set \
     VERSION="$ROCKY_VERSION" \
-    BUILD="$BUILD_PREFIX-packageset-$ROCKY_VERSION" \
-    "${ROCKY_EXTRA_ARGS}"
+    BUILD="$BUILD_NAME" \
+    ${ROCKY_EXTRA_ARGS}
 
 openqa-cli api \
     -X POST isos \
@@ -61,8 +63,8 @@ openqa-cli api \
     DISTRI=rocky \
     FLAVOR=minimal-iso \
     VERSION="$ROCKY_VERSION" \
-    BUILD="$BUILD_PREFIX-minimal-$ROCKY_VERSION" \
-    "${ROCKY_EXTRA_ARGS}"
+    BUILD="$BUILD_NAME" \
+    ${ROCKY_EXTRA_ARGS}
 
 openqa-cli api \
     -X POST isos \
@@ -71,5 +73,5 @@ openqa-cli api \
     DISTRI=rocky \
     FLAVOR=boot-iso \
     VERSION="$ROCKY_VERSION" \
-    BUILD="$BUILD_PREFIX-boot-$ROCKY_VERSION" \
-    "${ROCKY_EXTRA_ARGS}"
+    BUILD="$BUILD_NAME" \
+    ${ROCKY_EXTRA_ARGS}
diff --git a/scripts/run-openqa-tests.sh b/scripts/run-openqa-tests.sh
index 7f8fa91b..80e9f98e 100755
--- a/scripts/run-openqa-tests.sh
+++ b/scripts/run-openqa-tests.sh
@@ -1,9 +1,6 @@
 #!/bin/bash
 set -e
 
-MAJOR_VERSION=9
-MINOR_VERSION=0
-
 ## Usage: Post an ISO for the specified FLAVOR. Defaults to boot-iso.
 #
 ## Run the boot-iso FLAVOR
@@ -15,13 +12,14 @@ MINOR_VERSION=0
 ## Run the localization test suites
 # ROCKY_FLAVOR ROCKY_EXTRA_ARGS=TEST=install_arabic_language,install_asian_language,install_european_language,install_cyrillic_language scripts/run-openqa-tests.sh
 
+ROCKY_VERSION="9.2"
+
+MAJOR_VERSION=$(awk -F '.' '{print $1}' <<< $ROCKY_VERSION)
+MINOR_VERSION=$(awk -F '.' '{print $2}' <<< $ROCKY_VERSION)
 ROCKY_FLAVOR="${ROCKY_FLAVOR:-boot-iso}"
-ROCKY_VERSION="$MAJOR_VERSION.$MINOR_VERSION"
 ROCKY_ARCH="${ROCKY_ARCH:=x86_64}"
 ROCKY_EXTRA_ARGS="${ROCKY_EXTRA_ARGS:-}"
-BUILD_PREFIX="-$(date +%Y%m%d.%H%M%S).0-$(git branch --show-current)"
-BUILD_NAME="$BUILD_PREFIX-$ROCKY_FLAVOR-$ROCKY_VERSION"
-
+BUILD_NAME="-$(date +%Y%m%d).0-$(git branch --show-current)-$ROCKY_VERSION"
 ISO_PREFIX="Rocky-$ROCKY_VERSION-$ROCKY_ARCH"
 
 if [[ "$ROCKY_FLAVOR" == "dvd-iso" || "$ROCKY_FLAVOR" == "universal" ]]; then
-- 
2.43.5


From 0cab21c1d970040c0cdd6cba793d03756abc61ff Mon Sep 17 00:00:00 2001
From: Al Bowles <bowlesalx@gmail.com>
Date: Thu, 11 May 2023 21:58:06 -0500
Subject: [PATCH 2/2] cheers neil

---
 scripts/run-all-flavors.sh  | 4 ++--
 scripts/run-openqa-tests.sh | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/scripts/run-all-flavors.sh b/scripts/run-all-flavors.sh
index becb564d..cda3a704 100755
--- a/scripts/run-all-flavors.sh
+++ b/scripts/run-all-flavors.sh
@@ -8,8 +8,8 @@ set -e
 
 ROCKY_VERSION="9.2"
 
-MAJOR_VERSION=$(awk -F '.' '{print $1}' <<< $ROCKY_VERSION)
-MINOR_VERSION=$(awk -F '.' '{print $2}' <<< $ROCKY_VERSION)
+MAJOR_VERSION=${ROCKY_VERSION:0:1}
+MINOR_VERSION=${ROCKY_VERSION:2:1}
 ROCKY_ARCH="${ROCKY_ARCH:=x86_64}"
 ROCKY_EXTRA_ARGS="${ROCKY_EXTRA_ARGS:-}"
 BUILD_NAME="-$(date +%Y%m%d).0-$(git branch --show-current)-$ROCKY_VERSION"
diff --git a/scripts/run-openqa-tests.sh b/scripts/run-openqa-tests.sh
index 80e9f98e..124977f3 100755
--- a/scripts/run-openqa-tests.sh
+++ b/scripts/run-openqa-tests.sh
@@ -14,8 +14,8 @@ set -e
 
 ROCKY_VERSION="9.2"
 
-MAJOR_VERSION=$(awk -F '.' '{print $1}' <<< $ROCKY_VERSION)
-MINOR_VERSION=$(awk -F '.' '{print $2}' <<< $ROCKY_VERSION)
+MAJOR_VERSION=${ROCKY_VERSION:0:1}
+MINOR_VERSION=${ROCKY_VERSION:2:1}
 ROCKY_FLAVOR="${ROCKY_FLAVOR:-boot-iso}"
 ROCKY_ARCH="${ROCKY_ARCH:=x86_64}"
 ROCKY_EXTRA_ARGS="${ROCKY_EXTRA_ARGS:-}"
-- 
2.43.5