Build jammy charms for osm

[osm/devops.git] / installers / charm / osm-mon / tests / integration / test_charm.py

diff --git a/installers/charm/osm-mon/tests/integration/test_charm.py b/installers/charm/osm-mon/tests/integration/test_charm.py
index c5807e9..caf8ded 100644 (file)
--- a/installers/charm/osm-mon/tests/integration/test_charm.py
+++ b/installers/charm/osm-mon/tests/integration/test_charm.py
@@ -58,15 +58,16 @@ async def test_mon_is_deployed(ops_test: OpsTest):
 
     await asyncio.gather(
         ops_test.model.deploy(
-            charm, resources=resources, application_name=MON_APP, series="focal"
+            charm, resources=resources, application_name=MON_APP, series="jammy"
         ),
         ops_test.model.deploy(KAFKA_CHARM, application_name=KAFKA_APP, channel="stable"),
-        ops_test.model.deploy(MONGO_DB_CHARM, application_name=MONGO_DB_APP, channel="edge"),
+        ops_test.model.deploy(MONGO_DB_CHARM, application_name=MONGO_DB_APP, channel="5/edge"),
         ops_test.model.deploy(MARIADB_CHARM, application_name=MARIADB_APP, channel="stable"),
         ops_test.model.deploy(PROMETHEUS_CHARM, application_name=PROMETHEUS_APP, channel="stable"),
         ops_test.model.deploy(ZOOKEEPER_CHARM, application_name=ZOOKEEPER_APP, channel="stable"),
     )
-    cmd = f"juju deploy {KEYSTONE_CHARM} {KEYSTONE_APP} --resource keystone-image=opensourcemano/keystone:12"
+    keystone_image = "opensourcemano/keystone:testing-daily"
+    cmd = f"juju deploy {KEYSTONE_CHARM} {KEYSTONE_APP} --resource keystone-image={keystone_image} --channel=latest/beta --series jammy"
     await ops_test.run(*shlex.split(cmd), check=True)
 
     async with ops_test.fast_forward():
@@ -81,8 +82,10 @@ async def test_mon_is_deployed(ops_test: OpsTest):
     await ops_test.model.add_relation(KAFKA_APP, ZOOKEEPER_APP)
     await ops_test.model.add_relation(MARIADB_APP, KEYSTONE_APP)
 
-    logger.info("Adding relations")
-    await ops_test.model.add_relation(MON_APP, MONGO_DB_APP)
+    logger.info("Adding relations for MON")
+    await ops_test.model.add_relation(
+        "{}:mongodb".format(MON_APP), "{}:database".format(MONGO_DB_APP)
+    )
     await ops_test.model.add_relation(MON_APP, KAFKA_APP)
     await ops_test.model.add_relation(MON_APP, KEYSTONE_APP)
     await ops_test.model.add_relation(MON_APP, PROMETHEUS_APP)
@@ -179,7 +182,9 @@ async def test_mon_action_debug_mode_enabled(ops_test: OpsTest):
 @pytest.mark.abort_on_fail
 async def test_mon_integration_vca(ops_test: OpsTest):
     await asyncio.gather(
-        ops_test.model.deploy(VCA_CHARM, application_name=VCA_APP, channel="beta"),
+        ops_test.model.deploy(
+            VCA_CHARM, application_name=VCA_APP, channel="latest/beta", series="jammy"
+        ),
     )
     async with ops_test.fast_forward():
         await ops_test.model.wait_for_idle(