From 245562780baa9db5b192bdcb28104d3cb0e7b8d6 Mon Sep 17 00:00:00 2001
From: Ohad <orevah@redhat.com>
Date: Tue, 5 May 2026 11:23:08 +0300
Subject: [PATCH] [IUO] Fix runbook URL test failures: resilient GitHub fetch
 and AAQ support

Replace status code check with data validation in available_runbook_urls
fixture to handle non-200 responses that still contain valid data.
Add AAQ prometheus rule support to test_no_new_prometheus_rules so clusters
with AAQ enabled don't fail the assertion.

Signed-off-by: Ohad <orevah@redhat.com>
assisted by: claude code claude-opus-4-6
---
 tests/conftest.py                                   |  7 +++++++
 tests/observability/runbook_url/conftest.py         | 13 +++++++++++--
 tests/observability/runbook_url/test_runbook_url.py |  6 ++++--
 utilities/constants.py                              |  1 +
 4 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/tests/conftest.py b/tests/conftest.py
index 8c951a4209..7b85064643 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -1337,6 +1337,13 @@ def hpp_cr_installed(hostpath_provisioner_scope_session):
     return hostpath_provisioner_scope_session.exists
 
 
+@pytest.fixture(scope="session")
+def aaq_enabled(hyperconverged_resource_scope_session):
+    if not hyperconverged_resource_scope_session:
+        return False
+    return hyperconverged_resource_scope_session.instance.spec.get("enableApplicationAwareQuota", False)
+
+
 @pytest.fixture(scope="module")
 def cnv_pods(admin_client, hco_namespace):
     yield list(Pod.get(client=admin_client, namespace=hco_namespace.name))
diff --git a/tests/observability/runbook_url/conftest.py b/tests/observability/runbook_url/conftest.py
index e3717e0f7e..d819f6677b 100644
--- a/tests/observability/runbook_url/conftest.py
+++ b/tests/observability/runbook_url/conftest.py
@@ -57,8 +57,17 @@ def available_runbook_urls():
             url=runbooks_api_url,
             timeout=TIMEOUT_10SEC,
         ):
-            if sample.status_code == requests.codes.ok:
-                return {entry["html_url"] for entry in sample.json()}
+            if sample:
+                try:
+                    runbook_urls = {entry["html_url"] for entry in sample.json()}
+                except ValueError:
+                    LOGGER.error(
+                        f"Failed to decode JSON from '{runbooks_api_url}', "
+                        f"status: {sample.status_code}, content-type: {sample.headers.get('Content-Type')}"
+                    )
+                    continue
+                if runbook_urls:
+                    return runbook_urls
     except TimeoutExpiredError:
         LOGGER.error(
             f"Failed to fetch runbooks directory listing from '{runbooks_api_url}', "
diff --git a/tests/observability/runbook_url/test_runbook_url.py b/tests/observability/runbook_url/test_runbook_url.py
index 3e436dba0b..37af760d91 100644
--- a/tests/observability/runbook_url/test_runbook_url.py
+++ b/tests/observability/runbook_url/test_runbook_url.py
@@ -2,7 +2,7 @@
 
 import pytest
 
-from utilities.constants import CNV_PROMETHEUS_RULES
+from utilities.constants import AAQ_PROMETHEUS_RULE, CNV_PROMETHEUS_RULES
 
 LOGGER = logging.getLogger(__name__)
 
@@ -29,7 +29,7 @@ def validate_downstream_runbook_url(
 
 class TestRunbookUrlsAndPrometheusRules:
     @pytest.mark.polarion("CNV-10081")
-    def test_no_new_prometheus_rules(self, cnv_prometheus_rules_names, hpp_cr_installed):
+    def test_no_new_prometheus_rules(self, cnv_prometheus_rules_names, hpp_cr_installed, aaq_enabled):
         """
         Since validations for runbook url of all cnv alerts are done via polarion parameterization of prometheusrules,
         this test has been added to catch any new cnv prometheusrules that is not part of cnv_prometheus_rules_matrix
@@ -38,6 +38,8 @@ def test_no_new_prometheus_rules(self, cnv_prometheus_rules_names, hpp_cr_instal
         if not hpp_cr_installed:
             LOGGER.warning("HPP CR is not installed, removing prometheus-hpp-rules from the list of prometheus rules")
             expected_prometheus_rules_names.remove("prometheus-hpp-rules")
+        if aaq_enabled:
+            expected_prometheus_rules_names.append(AAQ_PROMETHEUS_RULE)
         assert sorted(cnv_prometheus_rules_names) == sorted(expected_prometheus_rules_names), (
             f"New cnv prometheusrule found: {set(cnv_prometheus_rules_names) - set(expected_prometheus_rules_names)}"
         )
diff --git a/utilities/constants.py b/utilities/constants.py
index 1daa476981..87707464e0 100644
--- a/utilities/constants.py
+++ b/utilities/constants.py
@@ -722,6 +722,7 @@ class UpgradeStreams:
     f"kubevirt-cnv-{PROMETHEUS_RULES_STR}",
     KUBEMACPOOL_PROMETHEUS_RULE,
 ]
+AAQ_PROMETHEUS_RULE = "prometheus-aaq-rules"
 
 
 class StorageClassNames: