[MISC] Fix data integrator tests (#1033)

* Fix data integrator tests

* Set test app extra user roles

Author: dragomirp

tests/integration/new_relations/test_new_relations_1.py

@@ -54,7 +54,9 @@ async def test_database_relation_with_charm_libraries(ops_test: OpsTest, charm):
                 application_name=APPLICATION_APP_NAME,
                 num_units=2,
                 base=CHARM_BASE,
-                channel="edge",
+                channel="latest/edge",
+                # TODO remove when setting predefined roles
+                config={"extra_user_roles": "CREATEDB,CREATEROLE"},
             ),
             ops_test.model.deploy(
                 charm,
@@ -192,7 +194,7 @@ async def test_two_applications_doesnt_share_the_same_relation_data(ops_test: Op
         APPLICATION_APP_NAME,
         application_name=another_application_app_name,
         base=CHARM_BASE,
-        channel="edge",
+        channel="latest/edge",
     )
     await ops_test.model.wait_for_idle(apps=all_app_names, status="active")
 
@@ -452,7 +454,9 @@ async def test_admin_role(ops_test: OpsTest):
     all_app_names = [DATA_INTEGRATOR_APP_NAME]
     all_app_names.extend(APP_NAMES)
     async with ops_test.fast_forward():
-        await ops_test.model.deploy(DATA_INTEGRATOR_APP_NAME, base=CHARM_BASE)
+        await ops_test.model.deploy(
+            DATA_INTEGRATOR_APP_NAME, channel="latest/edge", series="noble"
+        )
         await ops_test.model.wait_for_idle(apps=[DATA_INTEGRATOR_APP_NAME], status="blocked")
         await ops_test.model.applications[DATA_INTEGRATOR_APP_NAME].set_config({
             "database-name": DATA_INTEGRATOR_APP_NAME.replace("-", "_"),
@@ -544,7 +548,8 @@ async def test_invalid_extra_user_roles(ops_test: OpsTest):
         await ops_test.model.deploy(
             DATA_INTEGRATOR_APP_NAME,
             application_name=another_data_integrator_app_name,
-            base=CHARM_BASE,
+            channel="latest/edge",
+            series="noble",
         )
         await ops_test.model.wait_for_idle(
             apps=[another_data_integrator_app_name], status="blocked"

tests/integration/new_relations/test_relations_coherence.py

@@ -11,7 +11,7 @@
 
 from constants import DATABASE_DEFAULT_NAME
 
-from ..helpers import CHARM_BASE, DATABASE_APP_NAME, build_and_deploy
+from ..helpers import DATABASE_APP_NAME, build_and_deploy
 from .helpers import build_connection_string
 from .test_new_relations_1 import DATA_INTEGRATOR_APP_NAME
 
@@ -31,7 +31,7 @@ async def test_relations(ops_test: OpsTest, charm):
         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.deploy(DATA_INTEGRATOR_APP_NAME, series="noble")
         await ops_test.model.applications[DATA_INTEGRATOR_APP_NAME].set_config({
             "database-name": DATA_INTEGRATOR_APP_NAME.replace("-", "_"),
         })