Pin revsion for prometheus and grafana in kfp-api integration tests

canonical · Apr 8, 2024 · c529ddf · c529ddf
1 parent d8e231c
commit c529ddf
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 21 deletions.
diff --git a/charms/kfp-api/tests/integration/test_charm.py b/charms/kfp-api/tests/integration/test_charm.py
@@ -184,14 +184,6 @@ async def test_prometheus_grafana_integration(self, ops_test: OpsTest):
         prometheus_scrape = "prometheus-scrape-config-k8s"
         scrape_config = {"scrape_interval": "30s"}
 
-        # Deploy and relate prometheus
-        await ops_test.model.deploy(prometheus, channel="latest/stable", trust=True)
-        await ops_test.model.deploy(grafana, channel="latest/stable", trust=True)
-        await ops_test.model.deploy(
-            prometheus_scrape, channel="latest/stable", config=scrape_config, trust=True
-        )
-
-        await ops_test.model.add_relation(APP_NAME, prometheus_scrape)
         await ops_test.juju(
             "deploy",
             prometheus,
@@ -212,6 +204,17 @@ async def test_prometheus_grafana_integration(self, ops_test: OpsTest):
             "--trust",
             check=True,
         )
+        await ops_test.model.deploy(
+            prometheus_scrape, channel="latest/stable", config=scrape_config, trust=True
+        )
+
+        await ops_test.model.add_relation(APP_NAME, prometheus_scrape)
+        await ops_test.model.add_relation(
+            f"{prometheus}:grafana-dashboard", f"{grafana}:grafana-dashboard"
+        )
+        await ops_test.model.add_relation(
+            f"{APP_NAME}:grafana-dashboard", f"{grafana}:grafana-dashboard"
+        )
         await ops_test.model.add_relation(
             f"{prometheus}:metrics-endpoint", f"{prometheus_scrape}:metrics-endpoint"
         )

diff --git a/tests/integration/data/kfp_against_latest_edge.yaml b/tests/integration/data/kfp_against_latest_edge.yaml
@@ -6,22 +6,22 @@ applications:
     trust: true
   istio-ingressgateway:
     _github_repo_name: istio-operators
-    channel: latest/edge
+    channel: 1.16/stable
     charm: istio-gateway
     options:
       kind: ingress
     scale: 1
     trust: true
   istio-pilot:
     _github_repo_name: istio-operators
-    channel: latest/edge
+    channel: 1.16/stable
     charm: istio-pilot
     options:
       default-gateway: kubeflow-gateway
     scale: 1
     trust: true
   kfp-api:
-    channel: latest/edge
+    channel: 2.0-alpha.7/stable
     charm: ch:kfp-api
     scale: 1
     trust: true
@@ -32,48 +32,48 @@ applications:
     options:
       database: mlpipeline
   kfp-persistence:
-    channel: latest/edge
+    channel: 2.0-alpha.7/stable
     charm: ch:kfp-persistence
     scale: 1
   kfp-profile-controller:
-    channel: latest/edge
+    channel: 2.0-alpha.7/stable
     charm: ch:kfp-profile-controller
     scale: 1
   kfp-schedwf:
-    channel: latest/edge
+    channel: 2.0-alpha.7/stable
     charm: ch:kfp-schedwf
     scale: 1
   kfp-ui:
-    channel: latest/edge
+    channel: 2.0-alpha.7/stable
     charm: ch:kfp-ui
     scale: 1
   kfp-viewer:
-    channel: latest/edge
+    channel: 2.0-alpha.7/stable
     charm: ch:kfp-viewer
     scale: 1
   kfp-viz:
-    channel: latest/edge
+    channel: 2.0-alpha.7/stable
     charm: ch:kfp-viz
     scale: 1
   kubeflow-dashboard:
     _github_repo_name: kubeflow-dashboard-operator
-    channel: latest/edge
+    channel: 1.7/stable
     charm: kubeflow-dashboard
     scale: 1
     trust: true
   kubeflow-profiles:
     _github_repo_name: kubeflow-profiles-operator
-    channel: latest/edge
+    channel: 1.7/stable
     charm: kubeflow-profiles
     scale: 1
     trust: true
   metacontroller-operator:
-    channel: latest/edge
+    channel: 2.0/stable
     charm: ch:metacontroller-operator
     scale: 1
     trust: true
   minio:
-    channel: latest/edge
+    channel: ckf-1.7/stable
     charm: ch:minio
     scale: 1
 bundle: kubernetes