From 1e520719cb6aeab54a58efd0ebdd7345d0ad4295 Mon Sep 17 00:00:00 2001
From: Alexander Todorov <atodorov@redhat.com>
Date: Thu, 21 Apr 2022 15:07:01 +0300
Subject: [PATCH] Don't run unsupported tests on 8.6 and 9.0

https://coreos.slack.com/archives/C0235DZB0DT/p1650536467098679?thread_ts=1650512166.141439&cid=C0235DZB0DT
---
 test/cases/aws_s3.sh     | 14 +++++++++++++-
 test/cases/gcp.sh        | 15 +++++++++++++--
 test/cases/generic_s3.sh | 14 +++++++++++++-
 3 files changed, 39 insertions(+), 4 deletions(-)

diff --git a/test/cases/aws_s3.sh b/test/cases/aws_s3.sh
index 82dd9ab09..2d410008d 100755
--- a/test/cases/aws_s3.sh
+++ b/test/cases/aws_s3.sh
@@ -1,8 +1,20 @@
 #!/bin/bash
-set -euo pipefail
 
 source /usr/libexec/osbuild-composer-test/set-env-variables.sh
 
+if [ "${NIGHTLY:=false}" == "true" ]; then
+    case "${ID}-${VERSION_ID}" in
+        "rhel-8.6" | "rhel-9.0" )
+            echo "$0 is not enabled for ${ID}-${VERSION_ID} skipping..."
+            exit 0
+            ;;
+        *)
+            ;;
+    esac
+fi
+
+set -euo pipefail
+
 # Container image used for cloud provider CLI tools
 CONTAINER_IMAGE_CLOUD_TOOLS="quay.io/osbuild/cloud-tools:latest"
 
diff --git a/test/cases/gcp.sh b/test/cases/gcp.sh
index 6ef033ac2..70bf139cc 100755
--- a/test/cases/gcp.sh
+++ b/test/cases/gcp.sh
@@ -7,10 +7,21 @@
 # that the package from blueprint was installed.
 #
 
-set -euo pipefail
-
 source /usr/libexec/osbuild-composer-test/set-env-variables.sh
 
+if [ "${NIGHTLY:=false}" == "true" ]; then
+    case "${ID}-${VERSION_ID}" in
+        "rhel-8.6" | "rhel-9.0" )
+            echo "$0 is not enabled for ${ID}-${VERSION_ID} skipping..."
+            exit 0
+            ;;
+        *)
+            ;;
+    esac
+fi
+
+set -euo pipefail
+
 # Colorful output.
 function greenprint {
     echo -e "\033[1;32m[$(date -Isecond)] ${1}\033[0m"
diff --git a/test/cases/generic_s3.sh b/test/cases/generic_s3.sh
index 527825112..bb0bb8b61 100755
--- a/test/cases/generic_s3.sh
+++ b/test/cases/generic_s3.sh
@@ -1,8 +1,20 @@
 #!/bin/bash
-set -euo pipefail
 
 source /usr/libexec/osbuild-composer-test/set-env-variables.sh
 
+if [ "${NIGHTLY:=false}" == "true" ]; then
+    case "${ID}-${VERSION_ID}" in
+        "rhel-8.6" | "rhel-9.0")
+            echo "$0 is not enabled for ${ID}-${VERSION_ID} skipping..."
+            exit 0
+            ;;
+        *)
+            ;;
+    esac
+fi
+
+set -euo pipefail
+
 # Container images for MinIO Server and Client
 CONTAINER_MINIO_CLIENT="quay.io/minio/mc:latest"
 CONTAINER_MINIO_SERVER="quay.io/minio/minio:latest"