Skip to content

Commit 1c617c4

Browse files
author
Juan Tirado
committed
Fix bundle_dir test to use more recent solution.
1 parent a6cc813 commit 1c617c4

3 files changed

Lines changed: 13 additions & 29 deletions

File tree

.github/workflows/test.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: Integration test
1+
name: Testing
22

33
on: [push, pull_request]
44

tests/bundle/bundle.yaml

Lines changed: 8 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,12 @@
1-
series: xenial
1+
series: jammy
22
applications:
3-
keystone:
4-
charm: "keystone"
5-
series: "focal"
6-
channel: "stable"
3+
grafana:
4+
charm: "grafana"
5+
channel: stable
76
num_units: 1
8-
annotations:
9-
"gui-x": "339.5"
10-
"gui-y": "-171"
11-
to:
12-
- "0"
13-
mysql-innodb:
14-
charm: "mysql-innodb-cluster"
15-
series: "jammy"
16-
channel: "stable"
7+
prometheus:
8+
charm: "prometheus"
9+
channel: stable
1710
num_units: 1
18-
annotations:
19-
"gui-x": "79.5"
20-
"gui-y": "-142"
21-
to:
22-
- "1"
2311
relations:
24-
- - "keystone:shared-db"
25-
- "mysql-innodb:shared-db"
26-
machines:
27-
"0":
28-
series: focal
29-
constraints: "arch=amd64 cores=1 cpu-power=100 mem=1740 root-disk=8192"
30-
"1":
31-
series: jammy
32-
constraints: "arch=amd64 cores=1 cpu-power=100 mem=1740 root-disk=8192"
12+
- ["prometheus:grafana-source", "grafana:grafana-source"]

tests/integration/test_model.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,10 @@ async def test_deploy_local_bundle_dir(event_loop):
5151

5252
app1 = model.applications.get('grafana')
5353
app2 = model.applications.get('prometheus')
54+
with open("/tmp/output", "w") as writer:
55+
writer.write(str(bundle_path)+"\n")
56+
for (k,v) in model.applications.items():
57+
writer.write(k)
5458
assert app1 and app2
5559
await model.block_until(lambda: (len(app1.units) == 1 and
5660
len(app2.units) == 1),

0 commit comments

Comments
 (0)