Deploy charms without jammy support with base ubuntu@20.04

canonical · Sep 24, 2024 · 47dfc6b · 47dfc6b
1 parent e42332d
commit 47dfc6b
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 4 deletions.
diff --git a/tests/integration/helpers.py b/tests/integration/helpers.py
@@ -271,6 +271,7 @@ async def deploy_and_relate_application_with_postgresql(
     channel: str = "stable",
     relation: str = "db",
     status: str = "blocked",
+    base: str = CHARM_BASE,
 ) -> int:
     """Helper function to deploy and relate application with PostgreSQL.
 
@@ -283,6 +284,7 @@ async def deploy_and_relate_application_with_postgresql(
         relation: Name of the PostgreSQL relation to relate
             the application to.
         status: The status to wait for in the application (default: blocked).
+        base: The base of the charm to deploy
 
     Returns:
         the id of the created relation.
@@ -293,7 +295,7 @@ async def deploy_and_relate_application_with_postgresql(
         channel=channel,
         application_name=application_name,
         num_units=number_of_units,
-        base=CHARM_BASE,
+        base=base,
     )
     await ops_test.model.wait_for_idle(
         apps=[application_name],

diff --git a/tests/integration/new_relations/test_new_relations.py b/tests/integration/new_relations/test_new_relations.py
@@ -682,10 +682,10 @@ async def test_indico_datatabase(ops_test: OpsTest) -> None:
             base=CHARM_BASE,
         )
         await ops_test.model.deploy(
-            "redis-k8s", channel="stable", application_name="redis-broker", base=CHARM_BASE
+            "redis-k8s", channel="stable", application_name="redis-broker", base="ubuntu@20.04"
         )
         await ops_test.model.deploy(
-            "redis-k8s", channel="stable", application_name="redis-cache", base=CHARM_BASE
+            "redis-k8s", channel="stable", application_name="redis-cache", base="ubuntu@20.04"
         )
         await asyncio.gather(
             ops_test.model.relate("redis-broker", "indico:redis-broker"),

diff --git a/tests/integration/test_db.py b/tests/integration/test_db.py
@@ -51,7 +51,12 @@ async def test_finos_waltz_db(ops_test: OpsTest) -> None:
 
         # Deploy and test the first deployment of Finos Waltz.
         relation_id = await deploy_and_relate_application_with_postgresql(
-            ops_test, "finos-waltz-k8s", FINOS_WALTZ_APP_NAME, APPLICATION_UNITS, channel="edge"
+            ops_test,
+            "finos-waltz-k8s",
+            FINOS_WALTZ_APP_NAME,
+            APPLICATION_UNITS,
+            channel="edge",
+            base="ubuntu@20.04",
         )
         await check_database_creation(ops_test, "waltz")