Avoid running data integration tests when focal only

Author: shayancanonical

.github/workflows/ci.yaml

@@ -116,6 +116,7 @@ jobs:
           - juju-snap-channel: "2.9/stable"
             agent-version: "2.9.45"
             libjuju-version:  "2.9.44.1"
+    if: ${{ ! (matrix.groups.path_to_test_file == "tests/integration/test_data_integrator.py" && matrix.ubuntu-versions.series == "focal") }}
     name: ${{ matrix.juju-snap-channel }} - (GH hosted) ${{ matrix.groups.job_name }} | ${{ matrix.ubuntu-versions.series }}
     needs:
       - lint
@@ -156,7 +157,9 @@ jobs:
             echo "mark_expression=not unstable" >> "$GITHUB_OUTPUT"
           fi
       - name: Run integration tests
-        run: tox run -e integration -- "${{ matrix.groups.path_to_test_file }}" --group="${{ matrix.groups.group_number }}" -m '${{ steps.select-test-stability.outputs.mark_expression }}' --mysql-router-charm-series=${{ matrix.ubuntu-versions.series }} --mysql-router-charm-bases-index=${{ matrix.ubuntu-versions.bases-index }}
+        if: 
+        run:
+          tox run -e integration -- "${{ matrix.groups.path_to_test_file }}" --group="${{ matrix.groups.group_number }}" -m '${{ steps.select-test-stability.outputs.mark_expression }}' --mysql-router-charm-series=${{ matrix.ubuntu-versions.series }} --mysql-router-charm-bases-index=${{ matrix.ubuntu-versions.bases-index }}
         env:
           LIBJUJU_VERSION_SPECIFIER: ${{ matrix.libjuju-version }}
           SECRETS_FROM_GITHUB: |

tests/integration/markers.py

@@ -9,7 +9,7 @@
 import pytest
 from pytest_operator.plugin import OpsTest
 
-from . import juju_, markers
+from . import juju_
 from .helpers import execute_queries_against_unit, get_tls_certificate_issuer
 
 logger = logging.getLogger(__name__)
@@ -41,7 +41,6 @@ async def get_data_integrator_credentials(ops_test: OpsTest) -> typing.Dict:
 
 @pytest.mark.group(1)
 @pytest.mark.abort_on_fail
-@markers.only_with_juju_secrets
 async def test_external_connectivity_with_data_integrator(
     ops_test: OpsTest, mysql_router_charm_series: str
 ) -> None:
@@ -104,7 +103,6 @@ async def test_external_connectivity_with_data_integrator(
 
 @pytest.mark.group(1)
 @pytest.mark.abort_on_fail
-@markers.only_with_juju_secrets
 async def test_external_connectivity_with_data_integrator_and_tls(ops_test: OpsTest) -> None:
     """Test data integrator along with TLS operator"""
     logger.info("Ensuring no data exists in the test database")