From 0333b2ef9a5801efb542af4b0719d7adcf988742 Mon Sep 17 00:00:00 2001 From: Phoevos Kalemkeris Date: Fri, 1 Sep 2023 15:45:00 +0300 Subject: [PATCH] fix: Pin Prometheus revision to 137 Pin Prometheus revision when deploying from `latest` to avoid fetching recent patches of the charm which assume `juju >= 3.0.3`. This is temporary patch until we migrate to Juju 3.1. Signed-off-by: Phoevos Kalemkeris --- charms/jupyter-controller/tests/integration/test_charm.py | 2 +- tests/test_charms.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/charms/jupyter-controller/tests/integration/test_charm.py b/charms/jupyter-controller/tests/integration/test_charm.py index ef4f7aeb..b7b7b9cb 100644 --- a/charms/jupyter-controller/tests/integration/test_charm.py +++ b/charms/jupyter-controller/tests/integration/test_charm.py @@ -69,7 +69,7 @@ async def test_prometheus_integration(ops_test: OpsTest): 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(prometheus, channel="latest/stable", revision=137, trust=True) await ops_test.model.deploy(prometheus_scrape, channel="latest/stable", config=scrape_config) await ops_test.model.add_relation(APP_NAME, prometheus_scrape) diff --git a/tests/test_charms.py b/tests/test_charms.py index 373a5236..50f0f280 100644 --- a/tests/test_charms.py +++ b/tests/test_charms.py @@ -279,7 +279,7 @@ async def test_prometheus_grafana_integration(ops_test): 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(prometheus, channel="latest/edge", revision=137, trust=True) await ops_test.model.deploy(grafana, channel="latest/edge", trust=True) await ops_test.model.deploy(prometheus_scrape, channel="latest/beta", config=scrape_config)