Fix data-int base

Author: dragomirp

tests/integration/new_relations/test_new_relations_1.py

@@ -580,10 +580,12 @@ async def test_invalid_extra_user_roles(ops_test: OpsTest):
 
         another_data_integrator_app_name = f"another-{DATA_INTEGRATOR_APP_NAME}"
         data_integrator_apps_names = [DATA_INTEGRATOR_APP_NAME, another_data_integrator_app_name]
+        # Base is ignored
         await ops_test.model.deploy(
             DATA_INTEGRATOR_APP_NAME,
             application_name=another_data_integrator_app_name,
-            base=CHARM_BASE,
+            channel="latest/edge",
+            series="jammy",
         )
         await ops_test.model.wait_for_idle(
             apps=[another_data_integrator_app_name], status="blocked"

tests/integration/new_relations/test_relations_coherence.py

@@ -4,6 +4,7 @@
 import logging
 import secrets
 import string
+from asyncio import gather
 
 import psycopg2
 import pytest
@@ -26,22 +27,23 @@
 async def test_relations(ops_test: OpsTest, charm):
     """Test that check relation data."""
     async with ops_test.fast_forward():
-        await ops_test.model.deploy(
-            charm,
-            application_name=DATABASE_APP_NAME,
-            num_units=1,
-            base=CHARM_BASE,
-            config={"profile": "testing"},
+        await gather(
+            ops_test.model.deploy(
+                charm,
+                application_name=DATABASE_APP_NAME,
+                num_units=1,
+                base=CHARM_BASE,
+                config={"profile": "testing"},
+            ),
+            # Creating first time relation with user role
+            # Base is ignored
+            ops_test.model.deploy(DATA_INTEGRATOR_APP_NAME, series="jammy"),
         )
-        await ops_test.model.wait_for_idle(apps=[DATABASE_APP_NAME], status="active", timeout=3000)
-
-        # Creating first time relation with user role
-        await ops_test.model.deploy(DATA_INTEGRATOR_APP_NAME, base=CHARM_BASE)
         await ops_test.model.applications[DATA_INTEGRATOR_APP_NAME].set_config({
             "database-name": DATA_INTEGRATOR_APP_NAME.replace("-", "_"),
         })
         await ops_test.model.add_relation(DATA_INTEGRATOR_APP_NAME, DATABASE_APP_NAME)
-        await ops_test.model.wait_for_idle(apps=APP_NAMES, status="active")
+        await ops_test.model.wait_for_idle(apps=APP_NAMES, status="active", timeout=1500)
 
         connection_string = await build_connection_string(
             ops_test,