Skip to content

Commit

Permalink
Merge branch 'track/1.7' into kf-4327-feat-port-jupyter-notebook-rock…
Browse files Browse the repository at this point in the history
…s-to-1-7
i-chvets authored Sep 14, 2023
2 parents eaa6adb + e2758f6 commit 1272e0b
Showing 1 changed file with 22 additions and 2 deletions.
24 changes: 22 additions & 2 deletions tests/test_charms.py
Original file line number Diff line number Diff line change
@@ -280,8 +280,28 @@ 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(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(CONTROLLER_APP_NAME, prometheus_scrape)

0 comments on commit 1272e0b

Please sign in to comment.