[DPE-6523] Remove AMD64-only test markers (#605)

Author: sinclert-canonical

tests/integration/helpers.py

@@ -317,29 +317,23 @@ async def app_name(ops_test: OpsTest) -> str:
     return None
 
 
-def cluster_name(unit: Unit, model_name: str) -> str:
-    """Returns the MySQL cluster name.
+async def get_model_logs(ops_test: OpsTest, log_level: str, log_lines: int = 100) -> str:
+    """Return the juju logs from a specific model.
 
     Args:
-        unit: A unit to get data from
-        model_name: The current model name
-    Returns:
-        The (str) mysql cluster name
-    """
-    output = subprocess.check_output([
-        "juju",
-        "show-unit",
-        unit.name,
-        "--format=json",
-        f"--model={model_name}",
-    ])
-    output = json.loads(output.decode("utf-8"))
-
-    for relation in output[unit.name]["relation-info"]:
-        if relation["endpoint"] == "database-peers":
-            return relation["application-data"]["cluster-name"]
-    logger.error(f"Failed to retrieve cluster name from unit {unit.name}")
-    raise ValueError("Failed to retrieve cluster name")
+        ops_test: The ops test object passed into every test case
+        log_level: The logging level to return messages from
+        log_lines: The maximum lines to return at once
+    """
+    _, output, _ = await ops_test.juju(
+        "debug-log",
+        f"--model={ops_test.model.info.name}",
+        f"--level={log_level}",
+        f"--lines={log_lines}",
+        "--no-tail",
+    )
+
+    return output
 
 
 async def get_process_pid(ops_test: OpsTest, unit_name: str, process: str) -> int:

tests/integration/high_availability/test_upgrade_from_stable.py

@@ -7,7 +7,7 @@
 import pytest
 from pytest_operator.plugin import OpsTest
 
-from .. import juju_, markers
+from .. import juju_
 from ..helpers import get_leader_unit, get_primary_unit_wrapper, retrieve_database_variable_value
 from .high_availability_helpers import (
     ensure_all_units_continuous_writes_incrementing,
@@ -23,7 +23,6 @@
 
 
 @pytest.mark.group(1)
-@markers.amd64_only  # TODO: remove after arm64 stable release
 @pytest.mark.abort_on_fail
 async def test_deploy_stable(ops_test: OpsTest) -> None:
     """Simple test to ensure that the mysql and application charms get deployed."""
@@ -55,7 +54,6 @@ async def test_deploy_stable(ops_test: OpsTest) -> None:
 
 
 @pytest.mark.group(1)
-@markers.amd64_only  # TODO: remove after arm64 stable release
 @pytest.mark.abort_on_fail
 async def test_pre_upgrade_check(ops_test: OpsTest) -> None:
     """Test that the pre-upgrade-check action runs successfully."""
@@ -80,7 +78,6 @@ async def test_pre_upgrade_check(ops_test: OpsTest) -> None:
 
 
 @pytest.mark.group(1)
-@markers.amd64_only  # TODO: remove after arm64 stable release
 async def test_upgrade_from_stable(ops_test: OpsTest):
     """Test updating from stable channel."""
     application = ops_test.model.applications[MYSQL_APP_NAME]

tests/integration/high_availability/test_upgrade_rollback_incompat.py

@@ -15,7 +15,12 @@
 from pytest_operator.plugin import OpsTest
 
 from .. import juju_, markers
-from ..helpers import get_leader_unit, get_relation_data, get_unit_by_index
+from ..helpers import (
+    get_leader_unit,
+    get_model_logs,
+    get_relation_data,
+    get_unit_by_index,
+)
 from .high_availability_helpers import (
     ensure_all_units_continuous_writes_incrementing,
     relate_mysql_and_application,
@@ -173,6 +178,11 @@ async def test_rollback(ops_test, continuous_writes) -> None:
     )
     await ops_test.model.wait_for_idle(apps=[MYSQL_APP_NAME], status="active", timeout=TIMEOUT)
 
+    logger.info("Ensure rollback has taken place")
+    message = "Downgrade is incompatible. Resetting workload"
+    warnings = await get_model_logs(ops_test, log_level="WARNING")
+    assert message in warnings
+
     logger.info("Ensure continuous_writes after rollback procedure")
     await ensure_all_units_continuous_writes_incrementing(ops_test)
 

tests/integration/high_availability/test_upgrade_skip_pre_upgrade_check.py

@@ -9,7 +9,6 @@
 import pytest
 from pytest_operator.plugin import OpsTest
 
-from .. import markers
 from .high_availability_helpers import (
     ensure_all_units_continuous_writes_incrementing,
     relate_mysql_and_application,
@@ -24,7 +23,6 @@
 
 
 @pytest.mark.group(1)
-@markers.amd64_only  # TODO: remove after arm64 stable release
 @pytest.mark.abort_on_fail
 async def test_deploy_stable(ops_test: OpsTest) -> None:
     """Simple test to ensure that the mysql and application charms get deployed."""
@@ -57,7 +55,6 @@ async def test_deploy_stable(ops_test: OpsTest) -> None:
 
 
 @pytest.mark.group(1)
-@markers.amd64_only  # TODO: remove after arm64 stable release
 async def test_refresh_without_pre_upgrade_check(ops_test: OpsTest):
     """Test updating from stable channel."""
     application = ops_test.model.applications[MYSQL_APP_NAME]
@@ -90,7 +87,6 @@ async def test_refresh_without_pre_upgrade_check(ops_test: OpsTest):
 
 
 @pytest.mark.group(1)
-@markers.amd64_only  # TODO: remove after arm64 stable release
 async def test_rollback_without_pre_upgrade_check(ops_test: OpsTest):
     """Test refresh back to stable channel."""
     application = ops_test.model.applications[MYSQL_APP_NAME]