From cdfdbf58989e591cf1fddc70b62515f65f375db9 Mon Sep 17 00:00:00 2001 From: Dragomir Penev Date: Sat, 28 Oct 2023 17:55:57 +0300 Subject: [PATCH] Saner marks --- .github/workflows/ci.yaml | 2 ++ tests/integration/test_db.py | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 2a04a0ce47..daa7de7d73 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -71,9 +71,11 @@ jobs: - juju-snap-channel: "3.1/stable" agent-version: "3.1.6" libjuju-version: "3.2.2" + exclude-mark: "not juju2" - juju-snap-channel: "2.9/stable" agent-version: "2.9.45" libjuju-version: "2.9.45.0" + exclude-mark: "not juju3" name: ${{ matrix.juju-snap-channel }} - (GH hosted) ${{ matrix.tox-environment }} needs: - lint diff --git a/tests/integration/test_db.py b/tests/integration/test_db.py index 70acc1c268..6002f39020 100644 --- a/tests/integration/test_db.py +++ b/tests/integration/test_db.py @@ -316,7 +316,7 @@ async def test_weebl_db(ops_test: OpsTest, charm: str) -> None: await ops_test.model.remove_application("weebl", block_until_done=True) -@pytest.mark.notjuju3 +@pytest.mark.juju2 async def test_canonical_livepatch_onprem_bundle_db(ops_test: OpsTest) -> None: # Deploy and test the Livepatch onprem bundle (using this PostgreSQL charm # and an overlay to make the Ubuntu Advantage charm work with PostgreSQL).