Temporary disable 2 regression tests on 9.5

Related: COMPOSER-2264
osbuild · Jun 7, 2024 · c80ca0a · c80ca0a
1 parent ee1f70e
commit c80ca0a
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 4 deletions.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -234,17 +234,15 @@ regression-composer-works-behind-satellite-fallback:
   extends: .regression
   rules:
     # BLACKLIST: Skipped on subscribed RHEL machines
-    - if: $RUNNER !~ "/^.*(rhel-.*-ga|centos|fedora).*$/" && $CI_PIPELINE_SOURCE != "schedule"
-    - !reference [.nightly_rules_all, rules]
+    - if: $RUNNER !~ "/^.*(rhel-.*-ga|centos|fedora).*$/" && $RUNNER !~ "/^.*(rhel-9.5).*$/" && $CI_PIPELINE_SOURCE != "schedule"
   variables:
     SCRIPT: regression-composer-works-behind-satellite-fallback.sh
 
 regression-composer-works-behind-satellite:
   extends: .regression
   rules: 
     # BLACKLIST: Skipped on subscribed RHEL machines
-    - if: $RUNNER !~ "/^.*(rhel-.*-ga|centos|fedora).*$/" && $CI_PIPELINE_SOURCE != "schedule"
-    - !reference [.nightly_rules_all, rules]
+    - if: $RUNNER !~ "/^.*(rhel-.*-ga|centos|fedora).*$/" && $RUNNER !~ "/^.*(rhel-9.5).*$/" && $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
@@ -46,6 +46,13 @@ case "${ID}" in
         ;;
     "rhel")
         echo "Running on RHEL"
+
+        if [[ "$VERSION_ID" == "9.5" ]]; 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
+        fi
+
         case "${VERSION_ID%.*}" in
             "8" | "9")
                 echo "Running on RHEL ${VERSION_ID}"

diff --git a/test/cases/regression-composer-works-behind-satellite.sh b/test/cases/regression-composer-works-behind-satellite.sh
@@ -77,6 +77,13 @@ case "${ID}" in
         ;;
     "rhel")
         echo "Running on RHEL"
+
+        if [[ "$VERSION_ID" == "9.5" ]]; 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
+        fi
+
         case "${VERSION_ID%.*}" in
             "8" | "9")
                 echo "Running on RHEL ${VERSION_ID}"