Skip to content

Commit 528f3eb

Browse files
Juan Tiradocderici
authored andcommitted
Fix mini-bundle.
1 parent 8a0c21e commit 528f3eb

3 files changed

Lines changed: 16 additions & 15 deletions

File tree

tests/bundle/mini-bundle.yaml

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
1+
series: jammy
12
applications:
2-
ghost:
3-
charm: "ghost"
3+
grafana:
4+
charm: "grafana"
45
channel: stable
56
num_units: 1
6-
mysql:
7-
charm: "mysql"
8-
channel: candidate
7+
prometheus:
8+
charm: "prometheus"
9+
channel: stable
910
num_units: 1
1011
relations:
11-
- ["ghost", "mysql"]
12+
- ["prometheus:grafana-source", "grafana:grafana-source"]
Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
1-
series: xenial
1+
series: jammy
22
applications:
33
ghost:
4-
charm: "ghost"
4+
charm: "prometheus"
55
channel: stable
66
num_units: 1
77
mysql:
8-
charm: "mysql"
8+
charm: "prometheus"
99
channel: stable
1010
num_units: 1
1111
test:
1212
charm: "./tests/integration/charm"
1313
relations:
14-
- ["ghost", "mysql"]
14+
- ["prometheus:grafana-source", "grafana:grafana-source"]

tests/integration/test_model.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -57,11 +57,11 @@ async def test_deploy_local_bundle_file(event_loop):
5757
async with base.CleanModel() as model:
5858
await model.deploy(str(mini_bundle_file_path))
5959

60-
ghost = model.applications.get('ghost')
61-
mysql = model.applications.get('mysql')
62-
assert ghost and mysql
63-
await model.block_until(lambda: (len(ghost.units) == 1 and
64-
len(mysql.units) == 1),
60+
app1 = model.applications.get('grafana')
61+
app2 = model.applications.get('prometheus')
62+
assert app1 and app2
63+
await model.block_until(lambda: (len(app1.units) == 1 and
64+
len(app2.units) == 1),
6565
timeout=60 * 4)
6666

6767

0 commit comments

Comments
 (0)