From 701877249495504baa507742e6bd6bc4b3327349 Mon Sep 17 00:00:00 2001 From: Daniela Plascencia Date: Tue, 26 Sep 2023 12:11:14 +0200 Subject: [PATCH] fix: pin grafana and prometheus revisions Refs canonical/bundle-kubeflow#688 Refs canonical/bundle-kubeflow#690 --- tests/integration/test_charm.py | 25 +++++++++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-) diff --git a/tests/integration/test_charm.py b/tests/integration/test_charm.py index f15bf181..9c18ed6f 100644 --- a/tests/integration/test_charm.py +++ b/tests/integration/test_charm.py @@ -186,8 +186,29 @@ async def test_prometheus_grafana_integration(ops_test: OpsTest): prometheus_scrape_charm = "prometheus-scrape-config-k8s" scrape_config = {"scrape_interval": "5s"} - await ops_test.model.deploy(prometheus, channel="latest/beta", trust=True) - await ops_test.model.deploy(grafana, channel="latest/beta", trust=True) + # FIXME: Unpin revision once https://github.com/canonical/bundle-kubeflow/issues/688 is closed + await ops_test.juju( + "deploy", + prometheus, + "--channel", + "latest/edge", + "--revision", + "137", + "--trust", + check=True, + ) + # FIXME: Unpin revision once https://github.com/canonical/bundle-kubeflow/issues/690 is closed + await ops_test.juju( + "deploy", + grafana, + "--channel", + "latest/edge", + "--revision", + "89", + "--trust", + check=True, + ) + await ops_test.model.add_relation( f"{prometheus}:grafana-dashboard", f"{grafana}:grafana-dashboard" )