Fix bundle_dir test to use more recent solution.

Author: Juan Tirado

tests/bundle/bundle.yaml

@@ -1,32 +1,12 @@
-series: xenial
+series: jammy
 applications:
-  wordpress:
-    charm: "wordpress"
-    series: "xenial"
-    channel: "candidate"
+  grafana:
+    charm: "grafana"
+    channel: stable
     num_units: 1
-    annotations:
-      "gui-x": "339.5"
-      "gui-y": "-171"
-    to:
-      - "0"
-  mysql:
-    charm: "mysql"
-    series: "trusty"
-    channel: "candidate"
+  prometheus:
+    charm: "prometheus"
+    channel: stable
     num_units: 1
-    annotations:
-      "gui-x": "79.5"
-      "gui-y": "-142"
-    to:
-      - "1"
 relations:
-  - - "wordpress:db"
-    - "mysql:db"
-machines:
-  "0":
-    series: xenial
-    constraints: "arch=amd64 cores=1 cpu-power=100 mem=1740 root-disk=8192"
-  "1":
-    series: trusty
-    constraints: "arch=amd64 cores=1 cpu-power=100 mem=1740 root-disk=8192"
+  - ["prometheus:grafana-source", "grafana:grafana-source"]

tests/integration/test_model.py

@@ -36,11 +36,15 @@ async def test_deploy_local_bundle_dir(event_loop):
     async with base.CleanModel() as model:
         await model.deploy(str(bundle_path))
 
-        wordpress = model.applications.get('wordpress')
-        mysql = model.applications.get('mysql')
-        assert wordpress and mysql
-        await model.block_until(lambda: (len(wordpress.units) == 1 and
-                                len(mysql.units) == 1),
+        app1 = model.applications.get('grafana')
+        app2 = model.applications.get('prometheus')
+        with open("/tmp/output", "w") as writer:
+            writer.write(str(bundle_path)+"\n")
+            for (k,v) in model.applications.items():
+                writer.write(k)
+        assert app1 and app2
+        await model.block_until(lambda: (len(app1.units) == 1 and
+                                len(app2.units) == 1),
                                 timeout=60 * 4)