[MISC] Remove psql setpriv shim and switch stable upgrade tests to 16/stable (#1041)

* Stable refresh and snap bump

* Set series in coherence test

* Set series in new rel test

Author: dragomirp

refresh_versions.toml

@@ -6,6 +6,6 @@ name = "charmed-postgresql"
 
 [snap.revisions]
 # amd64
-x86_64 = "201"
+x86_64 = "203"
 # arm64
-aarch64 = "202"
+aarch64 = "204"

tests/integration/ha_tests/test_upgrade.py

@@ -5,6 +5,7 @@
 import platform
 import shutil
 import zipfile
+from asyncio import gather
 from pathlib import Path
 
 import pytest
@@ -33,23 +34,16 @@
 @pytest.mark.abort_on_fail
 async def test_deploy_latest(ops_test: OpsTest) -> None:
     """Simple test to ensure that the PostgreSQL and application charms get deployed."""
-    await ops_test.juju(
-        "deploy",
-        DATABASE_APP_NAME,
-        "-n",
-        3,
-        "--channel",
-        "16/edge",
-        "--config",
-        "profile=testing",
-        "--base",
-        "[email protected]",
-    )
-    await ops_test.model.deploy(
-        APPLICATION_NAME,
-        num_units=1,
-        channel="latest/edge",
-        config={"sleep_interval": 500},
+    await gather(
+        ops_test.model.deploy(
+            DATABASE_APP_NAME, num_units=3, channel="16/edge", config={"profile": "testing"}
+        ),
+        ops_test.model.deploy(
+            APPLICATION_NAME,
+            num_units=1,
+            channel="latest/edge",
+            config={"sleep_interval": 500},
+        ),
     )
     logger.info("Wait for applications to become active")
     async with ops_test.fast_forward():

tests/integration/ha_tests/test_upgrade_from_stable.py

@@ -1,6 +1,7 @@
 # Copyright 2023 Canonical Ltd.
 # See LICENSE file for licensing details.
 import logging
+from asyncio import gather
 
 import pytest
 from pytest_operator.plugin import OpsTest
@@ -26,22 +27,16 @@
 @pytest.mark.abort_on_fail
 async def test_deploy_stable(ops_test: OpsTest) -> None:
     """Simple test to ensure that the PostgreSQL and application charms get deployed."""
-    await ops_test.juju(
-        "deploy",
-        DATABASE_APP_NAME,
-        "-n",
-        3,
-        # TODO move to stable once we release refresh v3 to stable
-        "--channel",
-        "16/edge",
-        "--base",
-        "[email protected]",
-    )
-    await ops_test.model.deploy(
-        APPLICATION_NAME,
-        num_units=1,
-        channel="latest/edge",
-        config={"sleep_interval": 500},
+    await gather(
+        ops_test.model.deploy(
+            DATABASE_APP_NAME, num_units=3, channel="16/stable", config={"profile": "testing"}
+        ),
+        ops_test.model.deploy(
+            APPLICATION_NAME,
+            num_units=1,
+            channel="latest/edge",
+            config={"sleep_interval": 500},
+        ),
     )
     logger.info("Wait for applications to become active")
     async with ops_test.fast_forward():

tests/integration/new_relations/test_new_relations_1.py

@@ -236,7 +236,7 @@ async def test_two_applications_doesnt_share_the_same_relation_data(ops_test: Op
     await ops_test.model.deploy(
         APPLICATION_APP_NAME,
         application_name=another_application_app_name,
-        channel="edge",
+        channel="latest/edge",
         base=CHARM_BASE,
     )
     await ops_test.model.wait_for_idle(apps=all_app_names, status="active")
@@ -465,15 +465,20 @@ async def test_relation_with_no_database_name(ops_test: OpsTest):
 
 async def test_invalid_extra_user_roles(ops_test: OpsTest):
     async with ops_test.fast_forward():
-        await ops_test.model.deploy(DATA_INTEGRATOR_APP_NAME, base=CHARM_BASE)
+        # Base is ignored
+        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")
 
         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="noble",
         )
         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,23 +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="noble"),
         )
-        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.wait_for_idle(apps=[DATA_INTEGRATOR_APP_NAME], status="blocked")
         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,