From d3dde77a6fd4ed4f2870a9f25ffcaa6d915a3fff Mon Sep 17 00:00:00 2001
From: Alexander Todorov <atodorov@redhat.com>
Date: Tue, 9 Aug 2022 15:12:37 +0300
Subject: [PATCH] tests: Make Satellite regression tests to use the SUT

---
 ...-composer-works-behind-satellite-fallback.sh | 17 ++---------------
 ...egression-composer-works-behind-satellite.sh | 17 ++---------------
 2 files changed, 4 insertions(+), 30 deletions(-)

diff --git a/test/cases/regression-composer-works-behind-satellite-fallback.sh b/test/cases/regression-composer-works-behind-satellite-fallback.sh
index a1a554407..8fdd541a6 100644
--- a/test/cases/regression-composer-works-behind-satellite-fallback.sh
+++ b/test/cases/regression-composer-works-behind-satellite-fallback.sh
@@ -61,24 +61,11 @@ case "${ID}" in
     "rhel")
         echo "Running on RHEL"
         case "${VERSION_ID%.*}" in
-            "8" )
+            "8" | "9")
                 echo "Running on RHEL ${VERSION_ID}"
                 # starting in 8.5 the override file contains minor version number as well
                 VERSION_SUFFIX=$(echo "${VERSION_ID}" | tr -d ".")
-                DISTRO_NAME="rhel-8"
-                REPOSITORY_OVERRIDE="/etc/osbuild-composer/repositories/rhel-${VERSION_SUFFIX}.json"
-                REPO1_NAME="baseos"
-                REPO2_NAME="appstream"
-                if [ -n "${NIGHTLY:-}" ]; then
-                    REPO1_NAME="baseos-${ARCH}"
-                    REPO2_NAME="appstream-${ARCH}"
-                fi
-                ;;
-            "9" )
-                echo "Running on RHEL ${VERSION_ID}"
-                # in 9.0 the override file contains minor version number as well
-                VERSION_SUFFIX=$(echo "${VERSION_ID}" | tr -d ".")
-                DISTRO_NAME="rhel-90"
+                DISTRO_NAME="rhel-${VERSION_SUFFIX}"
                 REPOSITORY_OVERRIDE="/etc/osbuild-composer/repositories/rhel-${VERSION_SUFFIX}.json"
                 REPO1_NAME="baseos"
                 REPO2_NAME="appstream"
diff --git a/test/cases/regression-composer-works-behind-satellite.sh b/test/cases/regression-composer-works-behind-satellite.sh
index 765964b9b..beba30480 100644
--- a/test/cases/regression-composer-works-behind-satellite.sh
+++ b/test/cases/regression-composer-works-behind-satellite.sh
@@ -90,24 +90,11 @@ case "${ID}" in
     "rhel")
         echo "Running on RHEL"
         case "${VERSION_ID%.*}" in
-            "8" )
+            "8" | "9")
                 echo "Running on RHEL ${VERSION_ID}"
                 # starting in 8.5 the override file contains minor version number as well
                 VERSION_SUFFIX=$(echo "${VERSION_ID}" | tr -d ".")
-                DISTRO_NAME="rhel-8"
-                REPOSITORY_OVERRIDE="/etc/osbuild-composer/repositories/rhel-${VERSION_SUFFIX}.json"
-                REPO1_NAME="baseos"
-                REPO2_NAME="appstream"
-                if [ -n "${NIGHTLY:-}" ]; then
-                    REPO1_NAME="baseos-${ARCH}"
-                    REPO2_NAME="appstream-${ARCH}"
-                fi
-                ;;
-            "9" )
-                echo "Running on RHEL ${VERSION_ID}"
-                # in 9.0 the override file contains minor version number as well
-                VERSION_SUFFIX=$(echo "${VERSION_ID}" | tr -d ".")
-                DISTRO_NAME="rhel-90"
+                DISTRO_NAME="rhel-${VERSION_SUFFIX}"
                 REPOSITORY_OVERRIDE="/etc/osbuild-composer/repositories/rhel-${VERSION_SUFFIX}.json"
                 REPO1_NAME="baseos"
                 REPO2_NAME="appstream"