[MISC] Remove Sentry test (#554)

* Use jammy haproxy

* Remove Sentry test

* Lint

* Enable test app extension test on Juju 2

* Wait for unit to appear while checking for message

* Try livepatch on juju3

* Mark livepatch as unstable

Author: dragomirp

tests/integration/helpers.py

@@ -443,7 +443,8 @@ async def deploy_and_relate_bundle_with_postgresql(
         if status_message:
             awaits.append(
                 ops_test.model.block_until(
-                    lambda: unit.workload_status_message == status_message, timeout=timeout
+                    lambda: unit.workload_status_message == status_message,
+                    timeout=timeout,
                 )
             )
         await asyncio.gather(*awaits)

tests/integration/test_db.py

@@ -6,7 +6,6 @@
 
 import psycopg2 as psycopg2
 import pytest as pytest
-from juju.errors import JujuUnitError
 from mailmanclient import Client
 from pytest_operator.plugin import OpsTest
 from tenacity import Retrying, stop_after_delay, wait_fixed
@@ -22,7 +21,6 @@
     check_databases_creation,
     deploy_and_relate_application_with_postgresql,
     deploy_and_relate_bundle_with_postgresql,
-    find_unit,
     get_leader_unit,
     run_command_on_unit,
 )
@@ -196,85 +194,6 @@ async def test_relation_data_is_updated_correctly_when_scaling(ops_test: OpsTest
                 psycopg2.connect(primary_connection_string)
 
 
-@markers.juju2
-@pytest.mark.group(1)
-@markers.amd64_only  # sentry snap not available for arm64
-async def test_sentry_db_blocked(ops_test: OpsTest, charm: str) -> None:
-    async with ops_test.fast_forward():
-        # Deploy Sentry and its dependencies.
-        await asyncio.gather(
-            ops_test.model.deploy(
-                "omnivector-sentry", application_name="sentry1", series="bionic"
-            ),
-            ops_test.model.deploy("haproxy", series="focal"),
-            ops_test.model.deploy("omnivector-redis", application_name="redis", series="bionic"),
-        )
-        await ops_test.model.wait_for_idle(
-            apps=["sentry1"],
-            status="blocked",
-            raise_on_blocked=False,
-            timeout=1000,
-        )
-        await asyncio.gather(
-            ops_test.model.relate("sentry1", "redis"),
-            ops_test.model.relate("sentry1", f"{DATABASE_APP_NAME}:db"),
-            ops_test.model.relate("sentry1", "haproxy"),
-        )
-
-        # Only the leader will block
-        leader_unit = await find_unit(ops_test, DATABASE_APP_NAME, True)
-
-        try:
-            await ops_test.model.wait_for_idle(
-                apps=[DATABASE_APP_NAME],
-                status="blocked",
-                raise_on_blocked=True,
-                timeout=1000,
-            )
-            assert False, "Leader didn't block"
-        except JujuUnitError:
-            pass
-
-        assert leader_unit.workload_status_message == EXTENSIONS_BLOCKING_MESSAGE
-
-        # Verify that the charm unblocks when the extensions are enabled after being blocked
-        # due to disabled extensions.
-        logger.info("Verifying that the charm unblocks when the extensions are enabled")
-        config = {"plugin_citext_enable": "True"}
-        await ops_test.model.applications[DATABASE_APP_NAME].set_config(config)
-        await ops_test.model.wait_for_idle(
-            apps=[DATABASE_APP_NAME, "sentry1"],
-            status="active",
-            raise_on_blocked=False,
-            idle_period=15,
-        )
-
-        # Verify that the charm doesn't block when the extensions are enabled
-        # (another sentry deployment is used because it doesn't request a database
-        # again after the relation with the PostgreSQL charm is destroyed and reestablished).
-        logger.info("Verifying that the charm doesn't block when the extensions are enabled")
-        await asyncio.gather(
-            ops_test.model.remove_application("sentry1", block_until_done=True),
-            ops_test.model.deploy(
-                "omnivector-sentry", application_name="sentry2", series="bionic"
-            ),
-        )
-        await asyncio.gather(
-            ops_test.model.relate("sentry2", "redis"),
-            ops_test.model.relate("sentry2", f"{DATABASE_APP_NAME}:db"),
-            ops_test.model.relate("sentry2", "haproxy"),
-        )
-        await ops_test.model.wait_for_idle(
-            apps=[DATABASE_APP_NAME, "sentry2"], status="active", raise_on_blocked=False
-        )
-
-        await asyncio.gather(
-            ops_test.model.remove_application("redis", block_until_done=True),
-            ops_test.model.remove_application("sentry2", block_until_done=True),
-            ops_test.model.remove_application("haproxy", block_until_done=True),
-        )
-
-
 @pytest.mark.group(1)
 async def test_roles_blocking(ops_test: OpsTest, charm: str) -> None:
     await ops_test.model.deploy(
@@ -333,7 +252,6 @@ async def test_roles_blocking(ops_test: OpsTest, charm: str) -> None:
     )
 
 
-@markers.juju3  # As the Sentry test  already checks Juju 2.
 @pytest.mark.group(1)
 async def test_extensions_blocking(ops_test: OpsTest, charm: str) -> None:
     await asyncio.gather(
@@ -377,6 +295,7 @@ async def test_extensions_blocking(ops_test: OpsTest, charm: str) -> None:
 
 @markers.juju2
 @pytest.mark.group(1)
+@pytest.mark.unstable
 @markers.amd64_only  # canonical-livepatch-server charm (in bundle) not available for arm64
 async def test_canonical_livepatch_onprem_bundle_db(ops_test: OpsTest) -> None:
     # Deploy and test the Livepatch onprem bundle (using this PostgreSQL charm