From 9a223500aa7b166c016d86f1ecc6ac2f3075f597 Mon Sep 17 00:00:00 2001
From: Jakub Rusz <jrusz@redhat.com>
Date: Thu, 1 Aug 2024 13:43:42 +0200
Subject: [PATCH] tests/regression: do not schedule skipped tests

Also fail in case it does get scheduled so we actually notice.
---
 .gitlab-ci.yml                                                | 4 ++--
 .../regression-composer-works-behind-satellite-fallback.sh    | 2 +-
 test/cases/regression-composer-works-behind-satellite.sh      | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 5ec8a1b0d..a1c82f8a1 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -245,7 +245,7 @@ regression-composer-works-behind-satellite-fallback:
   extends: .regression
   rules:
     # BLACKLIST: Skipped on subscribed RHEL machines
-    - if: $RUNNER !~ "/^.*(rhel-.*-ga|centos|fedora).*$/" && $RUNNER !~ "/^.*(rhel-9.5).*$/" && $CI_PIPELINE_SOURCE != "schedule"
+    - if: $RUNNER !~ "/^.*(rhel-.*-ga|centos|fedora).*$/" && $RUNNER !~ "/^.*(rhel-9.5|rhel-10.0).*$/" && $CI_PIPELINE_SOURCE != "schedule"
   variables:
     SCRIPT: regression-composer-works-behind-satellite-fallback.sh
 
@@ -253,7 +253,7 @@ regression-composer-works-behind-satellite:
   extends: .regression
   rules: 
     # BLACKLIST: Skipped on subscribed RHEL machines
-    - if: $RUNNER !~ "/^.*(rhel-.*-ga|centos|fedora).*$/" && $RUNNER !~ "/^.*(rhel-9.5).*$/" && $CI_PIPELINE_SOURCE != "schedule"
+    - if: $RUNNER !~ "/^.*(rhel-.*-ga|centos|fedora).*$/" && $RUNNER !~ "/^.*(rhel-9.5|rhel-10.0).*$/" && $CI_PIPELINE_SOURCE != "schedule"
   variables:
     SCRIPT: regression-composer-works-behind-satellite.sh
 
diff --git a/test/cases/regression-composer-works-behind-satellite-fallback.sh b/test/cases/regression-composer-works-behind-satellite-fallback.sh
index 11cb8ae9d..0ca43d969 100644
--- a/test/cases/regression-composer-works-behind-satellite-fallback.sh
+++ b/test/cases/regression-composer-works-behind-satellite-fallback.sh
@@ -50,7 +50,7 @@ case "${ID}" in
         if [[ "$VERSION_ID" == "9.5" || "$VERSION_ID" == "10.0" ]]; then
             # fails eventhough we call update-ca-trust, see previous commit
             echo "This test has been disabled b/c DNF fails with self-signed certificates"
-            exit 0
+            exit 1
         fi
 
         case "${VERSION_ID%.*}" in
diff --git a/test/cases/regression-composer-works-behind-satellite.sh b/test/cases/regression-composer-works-behind-satellite.sh
index 62ea6efca..cb8f73665 100644
--- a/test/cases/regression-composer-works-behind-satellite.sh
+++ b/test/cases/regression-composer-works-behind-satellite.sh
@@ -81,7 +81,7 @@ case "${ID}" in
         if [[ "$VERSION_ID" == "9.5" || "$VERSION_ID" == "10.0" ]]; then
             # fails eventhough we call update-ca-trust, see previous commit
             echo "This test has been disabled b/c DNF fails with self-signed certificates"
-            exit 0
+            exit 1
         fi
 
         case "${VERSION_ID%.*}" in