Merge pull request #373 from pehala/fix_metrics

Override Gateway for metrics tests

testsuite/openshift/metrics/prometheus.py

@@ -86,7 +86,7 @@ def _wait_for_scrape():
                     return call_time < datetime.fromisoformat(target["lastScrape"][:26])
             return False
 
-        assert _wait_for_scrape()
+        assert _wait_for_scrape(), "Prometheus didn't reconcile ServiceMonitor in time"
 
     def close(self):
         """Close httpx client connection"""

testsuite/tests/kuadrant/authorino/metrics/conftest.py

@@ -5,6 +5,7 @@
 import pytest
 from openshift_client import selector
 
+from testsuite.gateway.envoy import Envoy
 from testsuite.openshift.config_map import ConfigMap
 from testsuite.openshift.metrics import ServiceMonitor, MetricsEndpoint, Prometheus
 
@@ -37,6 +38,22 @@ def prometheus(request, openshift):
     return pytest.skip("Skipping metrics tests as query route is not properly configured")
 
 
+@pytest.fixture(scope="module")
+def gateway(request, authorino, openshift, blame, label, testconfig) -> Envoy:
+    """Deploys Envoy that wires up the Backend behind the reverse-proxy and Authorino instance"""
+    gw = Envoy(
+        openshift,
+        blame("gw"),
+        authorino,
+        testconfig["service_protection"]["envoy"]["image"],
+        labels={"app": label},
+    )
+    request.addfinalizer(gw.delete)
+    gw.commit()
+    gw.wait_for_ready(timeout=10 * 60)
+    return gw
+
+
 @pytest.fixture(scope="module")
 def authorino(authorino, module_label):
     """Label Authorino controller-metrics service for the proper discovery"""