Skip to content

Commit

Permalink
fix: Pin Prometheus and Grafana revisions (#82)
Browse files Browse the repository at this point in the history
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 <[email protected]>
  • Loading branch information
phoevos authored and orfeas-k committed Sep 26, 2023
1 parent 951d9ba commit 1fe09f4
Showing 1 changed file with 22 additions and 2 deletions.
24 changes: 22 additions & 2 deletions tests/integration/test_charm.py
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,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)
Expand Down

0 comments on commit 1fe09f4

Please sign in to comment.