From 7f6eea88f87369655de998063287d4b2d6ca97c0 Mon Sep 17 00:00:00 2001 From: Phoevos Kalemkeris Date: Sat, 2 Sep 2023 19:10:49 +0300 Subject: [PATCH] fix: Pin Prometheus and Grafana revisions (#128) This is a temporary patch until we migrate to Juju 3.1: * Pin Prometheus revision when deploying from `latest` to avoid fetching recent patches of the charm which assume `juju >= 3.0.3`. Revision 137 was the last one seen working properly in our CI integration tests. * Pin Grafana revision when deploying from `latest` to avoid fetching recent patches of the charm which fail to install on Juju 2.9. Revision 89 was the last one working properly in our CI integration tests. Signed-off-by: Phoevos Kalemkeris --- tests/integration/test_charm.py | 24 ++++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) diff --git a/tests/integration/test_charm.py b/tests/integration/test_charm.py index 97a4aa2..73e20c2 100644 --- a/tests/integration/test_charm.py +++ b/tests/integration/test_charm.py @@ -136,8 +136,28 @@ async def test_prometheus_grafana_integration(ops_test: OpsTest): scrape_config = {"scrape_interval": "30s"} # Deploy and relate prometheus - await ops_test.model.deploy(prometheus, channel="latest/edge", trust=True) - await ops_test.model.deploy(grafana, channel="latest/edge", 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.deploy(prometheus_scrape, channel="latest/beta", config=scrape_config) await ops_test.model.add_relation(APP_NAME, prometheus_scrape)