From 6d0c8ced8dbd0669562a290cf95b12d5882f3c91 Mon Sep 17 00:00:00 2001
From: Alexander Todorov <atodorov@redhat.com>
Date: Mon, 19 Dec 2022 15:44:19 +0200
Subject: [PATCH] Update more test conditions based on code review

---
 .gitlab-ci.yml                            | 12 ++++--------
 test/cases/multi-tenancy.sh               |  2 +-
 test/cases/ostree-simplified-installer.sh |  2 +-
 3 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index aca7b5017..cfbf4dc72 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -74,10 +74,6 @@ init:
   RUNNER:
     - aws/rhel-8.8-nightly-x86_64
     - aws/rhel-8.8-nightly-aarch64
-    - aws/rhel-8.8-nightly-x86_64
-    - aws/rhel-8.8-nightly-aarch64
-    - aws/rhel-9.2-nightly-x86_64
-    - aws/rhel-9.2-nightly-aarch64
     - aws/rhel-9.2-nightly-x86_64
     - aws/rhel-9.2-nightly-aarch64
 
@@ -252,7 +248,7 @@ regression-bigiso:
   extends: .regression
   rules: 
     # WHITELIST: Run only on x86_64 and rhel like systems
-    - if: $RUNNER =~ "/^.*(rhel-8.6.*x86_64|rhel-9.0.*x86_64|centos-stream-8.*x86_64|centos-stream-9.*x86_64).*$/" && $CI_PIPELINE_SOURCE != "schedule"
+    - if: $RUNNER =~ "/^.*(rhel-8.*x86_64|rhel-9.*x86_64|centos-stream-8.*x86_64|centos-stream-9.*x86_64).*$/" && $CI_PIPELINE_SOURCE != "schedule"
   variables:
     SCRIPT: regression-bigiso.sh
 
@@ -278,7 +274,7 @@ regression-excluded-dependency:
   extends: .regression
   rules: 
     # WHITELIST
-    - if: $RUNNER =~ "/^.*(rhel-8.6|rhel-9.0|centos-stream-8|centos-stream-9).*$/" && $CI_PIPELINE_SOURCE != "schedule"
+    - if: $RUNNER =~ "/^.*(rhel-8.*|rhel-9.*|centos-stream-8|centos-stream-9).*$/" && $CI_PIPELINE_SOURCE != "schedule"
     - !reference [.nightly_rules_all, rules]
   variables:
     SCRIPT: regression-excluded-dependency.sh
@@ -500,7 +496,7 @@ koji.sh (cloud upload):
   parallel:
     matrix:
       - RUNNER:
-          # Brew workers use RHEL-8.6
+          # Brew workers use RHEL-8.7
           - aws/rhel-8.7-ga-x86_64
         INTERNAL_NETWORK: ["true"]
         CLOUD_TARGET: aws
@@ -680,7 +676,7 @@ Multi-tenancy:
     - schutzbot/deploy.sh
     - /usr/libexec/tests/osbuild-composer/multi-tenancy.sh
   variables:
-    # only 8.6 GA b/c the Image Builder service runs on RHEL 8
+    # only 8.7 GA b/c the Image Builder service runs on RHEL 8
     RUNNER: aws/rhel-8.7-ga-x86_64
     INTERNAL_NETWORK: "true"
 
diff --git a/test/cases/multi-tenancy.sh b/test/cases/multi-tenancy.sh
index 62ae413fd..d59d93829 100755
--- a/test/cases/multi-tenancy.sh
+++ b/test/cases/multi-tenancy.sh
@@ -63,7 +63,7 @@ sudo cp \
     "${OSBUILD_COMPOSER_TEST_DATA}"/kerberos/krb5-local.conf \
     /etc/krb5.conf.d/local
 
-DISTRO=rhel-86
+DISTRO=rhel-87
 
 function s3_request {
   cat <<EOF
diff --git a/test/cases/ostree-simplified-installer.sh b/test/cases/ostree-simplified-installer.sh
index f034cda1d..68dc2dbeb 100755
--- a/test/cases/ostree-simplified-installer.sh
+++ b/test/cases/ostree-simplified-installer.sh
@@ -892,7 +892,7 @@ check_result
 ##
 ########################################################################
 
-if [[ "${ID}-${VERSION_ID}" = "rhel-9.1" || "${ID}-${VERSION_ID}" = "centos-9" ]]; then
+if [[ "${ID}-${VERSION_ID}" = "rhel-9.2" || "${ID}-${VERSION_ID}" = "centos-9" ]]; then
    tee "$BLUEPRINT_FILE" > /dev/null <<EOF
 name = "simplified_iso_with_ignition_embedded_url"
 description = "A rhel-edge simplified-installer image with an embedded ignition config URL"