From a515ab8a04f5d355275c603e429c617cbd50b034 Mon Sep 17 00:00:00 2001 From: canonical-data-platform-bot Date: Wed, 4 Feb 2026 08:08:05 +0000 Subject: [PATCH 1/8] Bump mongo-charms-single-kernel to version v1.7.15 --- poetry.lock | 18 +++++++++--------- pyproject.toml | 4 ++-- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/poetry.lock b/poetry.lock index 31fe85bd9..ca95eb54e 100644 --- a/poetry.lock +++ b/poetry.lock @@ -1,4 +1,4 @@ -# This file is automatically @generated by Poetry 2.3.1 and should not be changed by hand. +# This file is automatically @generated by Poetry 2.3.2 and should not be changed by hand. [[package]] name = "allure-pytest" @@ -1203,14 +1203,14 @@ i18n = ["Babel (>=2.7)"] [[package]] name = "jmespath" -version = "1.0.1" +version = "1.1.0" description = "JSON Matching Expressions" optional = false -python-versions = ">=3.7" +python-versions = ">=3.9" groups = ["main", "integration"] files = [ - {file = "jmespath-1.0.1-py3-none-any.whl", hash = "sha256:02e2e4cc71b5bcab88332eebf907519190dd9e6e82107fa7f83b1003a6252980"}, - {file = "jmespath-1.0.1.tar.gz", hash = "sha256:90261b206d6defd58fdd5e85f478bf633a2901798906be2ad389150c5c60edbe"}, + {file = "jmespath-1.1.0-py3-none-any.whl", hash = "sha256:a5663118de4908c91729bea0acadca56526eb2698e83de10cd116ae0f4e97c64"}, + {file = "jmespath-1.1.0.tar.gz", hash = "sha256:472c87d80f36026ae83c6ddd0f1d05d4e510134ed462851fd5f754c8c3cbb88d"}, ] [[package]] @@ -1527,14 +1527,14 @@ files = [ [[package]] name = "mongo-charms-single-kernel" -version = "1.7.14" +version = "1.7.15" description = "Shared and reusable code for Mongo-related charms" optional = false python-versions = "<4.0,>=3.10" groups = ["main", "integration"] files = [ - {file = "mongo_charms_single_kernel-1.7.14-py3-none-any.whl", hash = "sha256:1058620cfbc1be3f198049e203bd7bbd253dd119496772dfb00ce85a09f3b29b"}, - {file = "mongo_charms_single_kernel-1.7.14.tar.gz", hash = "sha256:8cfb25a41bebee92f562a46ea02dc9cdcd35b015607d4ad4cfcec4a9bc98ea55"}, + {file = "mongo_charms_single_kernel-1.7.15-py3-none-any.whl", hash = "sha256:91479013a6b00c94ab5b30d73dfee126bb4c42ce3ae0f3dc14b32d99849e3a29"}, + {file = "mongo_charms_single_kernel-1.7.15.tar.gz", hash = "sha256:27e095a9a7fba712edd6f8f9b7a4d7b7e199df183e429565aa6270c4d19deedd"}, ] [package.dependencies] @@ -3175,4 +3175,4 @@ type = ["pytest-mypy"] [metadata] lock-version = "2.1" python-versions = "^3.10.12" -content-hash = "e92f6af94f353d913019040a22dd22e283164fb49b8a7bbb0d8a7c5deb80d651" +content-hash = "da92f01a0eb5f630713bd87b962edd717a74f1a021262d8f992f52fa38aeca2b" diff --git a/pyproject.toml b/pyproject.toml index c2d745d5c..3a5f13f9b 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -13,7 +13,7 @@ poetry-core = "^2.0" data-platform-helpers = "^0.1.3" rpds-py = "0.18.0" pyOpenSSL = "^24.2.1" -mongo-charms-single-kernel = "1.7.14" +mongo-charms-single-kernel = "1.7.15" [tool.poetry.group.charm-libs.dependencies] ops = ">=2.21" @@ -60,7 +60,7 @@ pytest-operator = "^0.36.0" pytest-operator-groups = {git = "https://github.com/canonical/data-platform-workflows", tag = "v29.0.0", subdirectory = "python/pytest_plugins/pytest_operator_groups"} pytest-github-secrets = {git = "https://github.com/canonical/data-platform-workflows", tag = "v29.0.0", subdirectory = "python/pytest_plugins/github_secrets"} allure-pytest-collection-report = {git = "https://github.com/canonical/data-platform-workflows", tag = "v29.0.0", subdirectory = "python/pytest_plugins/allure_pytest_collection_report"} -mongo-charms-single-kernel = "1.7.14" +mongo-charms-single-kernel = "1.7.15" [build-system] build-backend = "poetry.core.masonry.api" From ada8957e4e91659f4cd15d275e30f4d003f3e09d Mon Sep 17 00:00:00 2001 From: Neha Oudin Date: Wed, 4 Feb 2026 09:11:14 +0100 Subject: [PATCH 2/8] fix: build on arm64 --- charmcraft.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/charmcraft.yaml b/charmcraft.yaml index 235891309..69ce96a22 100644 --- a/charmcraft.yaml +++ b/charmcraft.yaml @@ -4,6 +4,7 @@ type: charm platforms: ubuntu@24.04:amd64: + ubuntu@24.04:arm64: # Files implicitly created by charmcraft without a part: # - dispatch (https://github.com/canonical/charmcraft/pull/1898) # - manifest.yaml From cba68220e32fcef720d9b95a28f95d0b178b8c85 Mon Sep 17 00:00:00 2001 From: Neha Oudin Date: Wed, 4 Feb 2026 09:19:18 +0100 Subject: [PATCH 3/8] fix: CI --- poetry.lock | 10 +++---- tests/integration/conftest.py | 52 +++++++++++++++++++++++++---------- 2 files changed, 42 insertions(+), 20 deletions(-) diff --git a/poetry.lock b/poetry.lock index ca95eb54e..5b7653f7e 100644 --- a/poetry.lock +++ b/poetry.lock @@ -1,4 +1,4 @@ -# This file is automatically @generated by Poetry 2.3.2 and should not be changed by hand. +# This file is automatically @generated by Poetry 2.2.1 and should not be changed by hand. [[package]] name = "allure-pytest" @@ -1227,7 +1227,7 @@ files = [ [package.dependencies] attrs = ">=22.2.0" -jsonschema-specifications = ">=2023.3.6" +jsonschema-specifications = ">=2023.03.6" referencing = ">=0.28.4" rpds-py = ">=0.7.1" @@ -1294,7 +1294,7 @@ files = [ ] [package.dependencies] -certifi = ">=14.5.14" +certifi = ">=14.05.14" google-auth = ">=1.0.1" oauthlib = ">=3.2.2" python-dateutil = ">=2.5.3" @@ -2803,10 +2803,10 @@ files = [ ] [package.dependencies] -botocore = ">=1.37.4,<2.0a0" +botocore = ">=1.37.4,<2.0a.0" [package.extras] -crt = ["botocore[crt] (>=1.37.4,<2.0a0)"] +crt = ["botocore[crt] (>=1.37.4,<2.0a.0)"] [[package]] name = "setuptools" diff --git a/tests/integration/conftest.py b/tests/integration/conftest.py index 20c67fb58..6da45c245 100644 --- a/tests/integration/conftest.py +++ b/tests/integration/conftest.py @@ -2,25 +2,47 @@ # Copyright 2024 Canonical Ltd. # See LICENSE file for licensing details. -import json import os -from pathlib import Path +import pathlib +import subprocess -from pytest_operator.plugin import OpsTest - -def ops_test(ops_test: OpsTest) -> OpsTest: +def pytest_configure(config) -> None: if os.environ.get("CI") == "true": # Running in GitHub Actions; skip build step - # (GitHub Actions uses a separate, cached build step. See .github/workflows/ci.yaml) - packed_charms = json.loads(os.environ["CI_PACKED_CHARMS"]) + plugin = config.pluginmanager.get_plugin("pytest-operator") + plugin.OpsTest.build_charm = _build_charm + + # Remove charmcraft dependency from `ops_test` fixture + check_deps = plugin.check_deps + plugin.check_deps = lambda *deps: check_deps(*(dep for dep in deps if dep != "charmcraft")) - async def build_charm(charm_path, bases_index: int = None) -> Path: - for charm in packed_charms: - if Path(charm_path) == Path(charm["directory_path"]): - if bases_index is None or bases_index == charm["bases_index"]: - return charm["file_path"] - raise ValueError(f"Unable to find .charm file for {bases_index=} at {charm_path=}") - ops_test.build_charm = build_charm - return ops_test +async def _build_charm(self, charm_path: str | os.PathLike) -> pathlib.Path: + charm_path = pathlib.Path(charm_path) + architecture = subprocess.run( + ["dpkg", "--print-architecture"], + capture_output=True, + check=True, + encoding="utf-8", + ).stdout.strip() + assert architecture in ("amd64", "arm64") + packed_charms = list(charm_path.glob(f"*{architecture}.charm")) + if len(packed_charms) == 1: + # python-libjuju's model.deploy(), juju deploy, and juju bundle files expect local charms + # to begin with `./` or `/` to distinguish them from Charmhub charms. + # Therefore, we need to return an absolute path—a relative `pathlib.Path` does not start + # with `./` when cast to a str. + # (python-libjuju model.deploy() expects a str but will cast any input to a str as a + # workaround for pytest-operator's non-compliant `build_charm` return type of + # `pathlib.Path`.) + return packed_charms[0].resolve(strict=True) + elif len(packed_charms) > 1: + raise ValueError( + f"More than one matching .charm file found at {charm_path=} for {architecture=} and " + f"Ubuntu 24.04: {packed_charms}." + ) + else: + raise ValueError( + f"Unable to find .charm file for {architecture=} and Ubuntu 24.04 at {charm_path=}" + ) From 5b584dce36336dbe461b154e88fffcdd2783fcad Mon Sep 17 00:00:00 2001 From: Neha Oudin Date: Wed, 4 Feb 2026 09:39:31 +0100 Subject: [PATCH 4/8] fix: DPW v41.1.1 --- .github/workflows/ci.yaml | 10 +++++----- .github/workflows/release.yaml | 6 +++--- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index a1116589b..f89c6e570 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -9,7 +9,7 @@ concurrency: on: pull_request: schedule: - - cron: '53 0 * * *' # Daily at 00:53 UTC + - cron: "53 0 * * *" # Daily at 00:53 UTC # Triggered on push to branch "main" by .github/workflows/release.yaml workflow_call: outputs: @@ -20,7 +20,7 @@ on: jobs: lint: name: Lint - uses: canonical/data-platform-workflows/.github/workflows/lint.yaml@v29.0.0 + uses: canonical/data-platform-workflows/.github/workflows/lint.yaml@v41.1.1 terraform-test: name: Terraform - Validation and replica-set product @@ -128,7 +128,7 @@ jobs: path: - . name: Build charm | ${{ matrix.path }} - uses: canonical/data-platform-workflows/.github/workflows/build_charm.yaml@v29.0.0 + uses: canonical/data-platform-workflows/.github/workflows/build_charm.yaml@v41.1.1 with: path-to-charm-directory: ${{ matrix.path }} cache: false @@ -138,11 +138,11 @@ jobs: needs: - lint - build - uses: canonical/data-platform-workflows/.github/workflows/integration_test_charm.yaml@v29.0.0 + uses: canonical/data-platform-workflows/.github/workflows/integration_test_charm.yaml@v41.1.1 with: artifact-prefix: ${{ needs.build.outputs.artifact-prefix }} cloud: lxd - juju-agent-version: 3.6.1 # renovate: juju-agent-pin-minor + juju-agent-version: 3.6.1 # renovate: juju-agent-pin-minor _beta_allure_report: true permissions: contents: write # Needed for Allure Report beta diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 021f80d4b..342f571f1 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -10,20 +10,20 @@ jobs: uses: ./.github/workflows/ci.yaml secrets: inherit permissions: - contents: write # Needed for Allure Report beta + contents: write # Needed for Allure Report beta release: name: Release charm needs: - ci-tests - uses: canonical/data-platform-workflows/.github/workflows/release_charm.yaml@v29.0.0 + uses: canonical/data-platform-workflows/.github/workflows/release_charm.yaml@v41.1.1 with: channel: 8-transition/edge artifact-prefix: ${{ needs.ci-tests.outputs.artifact-prefix }} secrets: charmhub-token: ${{ secrets.CHARMHUB_TOKEN }} permissions: - contents: write # Needed to create git tags + contents: write # Needed to create git tags release-libraries: name: Release libraries From ddd71612b741504c1d122b63ad02da9b0a103c71 Mon Sep 17 00:00:00 2001 From: Neha Oudin Date: Wed, 4 Feb 2026 09:41:16 +0100 Subject: [PATCH 5/8] fix: DPW v41.1.1 --- poetry.lock | 20 ++++++++++---------- pyproject.toml | 6 +++--- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/poetry.lock b/poetry.lock index 5b7653f7e..b1112e928 100644 --- a/poetry.lock +++ b/poetry.lock @@ -21,7 +21,7 @@ name = "allure-pytest-collection-report" version = "0.1.0" description = "" optional = false -python-versions = "^3.8" +python-versions = ">=3.8" groups = ["integration"] files = [] develop = false @@ -33,8 +33,8 @@ pytest = "*" [package.source] type = "git" url = "https://github.com/canonical/data-platform-workflows" -reference = "v29.0.0" -resolved_reference = "90077c956fd22995aec4c1e5b86cf6248717d8c7" +reference = "v41.1.1" +resolved_reference = "55396181c502f3c6a1916f63a33bc87aec376df2" subdirectory = "python/pytest_plugins/allure_pytest_collection_report" [[package]] @@ -2379,7 +2379,7 @@ name = "pytest-github-secrets" version = "0.1.0" description = "" optional = false -python-versions = "^3.8" +python-versions = ">=3.8" groups = ["integration"] files = [] develop = false @@ -2387,8 +2387,8 @@ develop = false [package.source] type = "git" url = "https://github.com/canonical/data-platform-workflows" -reference = "v29.0.0" -resolved_reference = "90077c956fd22995aec4c1e5b86cf6248717d8c7" +reference = "v41.1.1" +resolved_reference = "55396181c502f3c6a1916f63a33bc87aec376df2" subdirectory = "python/pytest_plugins/github_secrets" [[package]] @@ -2434,7 +2434,7 @@ name = "pytest-operator-groups" version = "0.1.0" description = "" optional = false -python-versions = "^3.8" +python-versions = ">=3.8" groups = ["integration"] files = [] develop = false @@ -2445,8 +2445,8 @@ pytest = "*" [package.source] type = "git" url = "https://github.com/canonical/data-platform-workflows" -reference = "v29.0.0" -resolved_reference = "90077c956fd22995aec4c1e5b86cf6248717d8c7" +reference = "v41.1.1" +resolved_reference = "55396181c502f3c6a1916f63a33bc87aec376df2" subdirectory = "python/pytest_plugins/pytest_operator_groups" [[package]] @@ -3175,4 +3175,4 @@ type = ["pytest-mypy"] [metadata] lock-version = "2.1" python-versions = "^3.10.12" -content-hash = "da92f01a0eb5f630713bd87b962edd717a74f1a021262d8f992f52fa38aeca2b" +content-hash = "f1b32cfdf9021feb2d8bc493f2f2f0376c5d31fbda44f652167f1b4c5ad2587f" diff --git a/pyproject.toml b/pyproject.toml index 3a5f13f9b..4417a648e 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -57,9 +57,9 @@ pytest = "^8.1.1" pytest-asyncio = "^0.21.1" pytest-mock = "^3.14.0" pytest-operator = "^0.36.0" -pytest-operator-groups = {git = "https://github.com/canonical/data-platform-workflows", tag = "v29.0.0", subdirectory = "python/pytest_plugins/pytest_operator_groups"} -pytest-github-secrets = {git = "https://github.com/canonical/data-platform-workflows", tag = "v29.0.0", subdirectory = "python/pytest_plugins/github_secrets"} -allure-pytest-collection-report = {git = "https://github.com/canonical/data-platform-workflows", tag = "v29.0.0", subdirectory = "python/pytest_plugins/allure_pytest_collection_report"} +pytest-operator-groups = {git = "https://github.com/canonical/data-platform-workflows", tag = "v41.1.1", subdirectory = "python/pytest_plugins/pytest_operator_groups"} +pytest-github-secrets = {git = "https://github.com/canonical/data-platform-workflows", tag = "v41.1.1", subdirectory = "python/pytest_plugins/github_secrets"} +allure-pytest-collection-report = {git = "https://github.com/canonical/data-platform-workflows", tag = "v41.1.1", subdirectory = "python/pytest_plugins/allure_pytest_collection_report"} mongo-charms-single-kernel = "1.7.15" [build-system] From 488083f5352e0df04fa0135da64f948f66de594f Mon Sep 17 00:00:00 2001 From: Neha Oudin Date: Wed, 4 Feb 2026 10:03:08 +0100 Subject: [PATCH 6/8] fix: rollback to 35.0.4 --- .github/workflows/ci.yaml | 6 +++--- .github/workflows/release.yaml | 2 +- poetry.lock | 14 +++++++------- pyproject.toml | 6 +++--- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index f89c6e570..6943df059 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -20,7 +20,7 @@ on: jobs: lint: name: Lint - uses: canonical/data-platform-workflows/.github/workflows/lint.yaml@v41.1.1 + uses: canonical/data-platform-workflows/.github/workflows/lint.yaml@v35.0.4 terraform-test: name: Terraform - Validation and replica-set product @@ -128,7 +128,7 @@ jobs: path: - . name: Build charm | ${{ matrix.path }} - uses: canonical/data-platform-workflows/.github/workflows/build_charm.yaml@v41.1.1 + uses: canonical/data-platform-workflows/.github/workflows/build_charm.yaml@v35.0.4 with: path-to-charm-directory: ${{ matrix.path }} cache: false @@ -138,7 +138,7 @@ jobs: needs: - lint - build - uses: canonical/data-platform-workflows/.github/workflows/integration_test_charm.yaml@v41.1.1 + uses: canonical/data-platform-workflows/.github/workflows/integration_test_charm.yaml@v35.0.4 with: artifact-prefix: ${{ needs.build.outputs.artifact-prefix }} cloud: lxd diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 342f571f1..ea814fc3f 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -16,7 +16,7 @@ jobs: name: Release charm needs: - ci-tests - uses: canonical/data-platform-workflows/.github/workflows/release_charm.yaml@v41.1.1 + uses: canonical/data-platform-workflows/.github/workflows/release_charm.yaml@v35.0.4 with: channel: 8-transition/edge artifact-prefix: ${{ needs.ci-tests.outputs.artifact-prefix }} diff --git a/poetry.lock b/poetry.lock index b1112e928..c36978fb7 100644 --- a/poetry.lock +++ b/poetry.lock @@ -33,8 +33,8 @@ pytest = "*" [package.source] type = "git" url = "https://github.com/canonical/data-platform-workflows" -reference = "v41.1.1" -resolved_reference = "55396181c502f3c6a1916f63a33bc87aec376df2" +reference = "v35.0.4" +resolved_reference = "a5b9f86aca2c006ccf44f0f425eb0ff01f0db205" subdirectory = "python/pytest_plugins/allure_pytest_collection_report" [[package]] @@ -2387,8 +2387,8 @@ develop = false [package.source] type = "git" url = "https://github.com/canonical/data-platform-workflows" -reference = "v41.1.1" -resolved_reference = "55396181c502f3c6a1916f63a33bc87aec376df2" +reference = "v35.0.4" +resolved_reference = "a5b9f86aca2c006ccf44f0f425eb0ff01f0db205" subdirectory = "python/pytest_plugins/github_secrets" [[package]] @@ -2445,8 +2445,8 @@ pytest = "*" [package.source] type = "git" url = "https://github.com/canonical/data-platform-workflows" -reference = "v41.1.1" -resolved_reference = "55396181c502f3c6a1916f63a33bc87aec376df2" +reference = "v35.0.4" +resolved_reference = "a5b9f86aca2c006ccf44f0f425eb0ff01f0db205" subdirectory = "python/pytest_plugins/pytest_operator_groups" [[package]] @@ -3175,4 +3175,4 @@ type = ["pytest-mypy"] [metadata] lock-version = "2.1" python-versions = "^3.10.12" -content-hash = "f1b32cfdf9021feb2d8bc493f2f2f0376c5d31fbda44f652167f1b4c5ad2587f" +content-hash = "01f78802dba940d9a2708436c7834267e96b3f1d9f1d268f26858a402c689411" diff --git a/pyproject.toml b/pyproject.toml index 4417a648e..185893cca 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -57,9 +57,9 @@ pytest = "^8.1.1" pytest-asyncio = "^0.21.1" pytest-mock = "^3.14.0" pytest-operator = "^0.36.0" -pytest-operator-groups = {git = "https://github.com/canonical/data-platform-workflows", tag = "v41.1.1", subdirectory = "python/pytest_plugins/pytest_operator_groups"} -pytest-github-secrets = {git = "https://github.com/canonical/data-platform-workflows", tag = "v41.1.1", subdirectory = "python/pytest_plugins/github_secrets"} -allure-pytest-collection-report = {git = "https://github.com/canonical/data-platform-workflows", tag = "v41.1.1", subdirectory = "python/pytest_plugins/allure_pytest_collection_report"} +pytest-operator-groups = {git = "https://github.com/canonical/data-platform-workflows", tag = "v35.0.4", subdirectory = "python/pytest_plugins/pytest_operator_groups"} +pytest-github-secrets = {git = "https://github.com/canonical/data-platform-workflows", tag = "v35.0.4", subdirectory = "python/pytest_plugins/github_secrets"} +allure-pytest-collection-report = {git = "https://github.com/canonical/data-platform-workflows", tag = "v35.0.4", subdirectory = "python/pytest_plugins/allure_pytest_collection_report"} mongo-charms-single-kernel = "1.7.15" [build-system] From a028bbf704b4d96b52e82b44a063cb5a7bc8b77d Mon Sep 17 00:00:00 2001 From: Neha Oudin Date: Wed, 4 Feb 2026 10:06:43 +0100 Subject: [PATCH 7/8] fix: release charm edge --- .github/workflows/release.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index ea814fc3f..7d481b55c 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -16,9 +16,9 @@ jobs: name: Release charm needs: - ci-tests - uses: canonical/data-platform-workflows/.github/workflows/release_charm.yaml@v35.0.4 + uses: canonical/data-platform-workflows/.github/workflows/release_charm_edge.yaml@v35.0.4 with: - channel: 8-transition/edge + track: 8-transition/edge artifact-prefix: ${{ needs.ci-tests.outputs.artifact-prefix }} secrets: charmhub-token: ${{ secrets.CHARMHUB_TOKEN }} From 3094377eca869e83eb2b9d1e4614cdeb730c4115 Mon Sep 17 00:00:00 2001 From: Neha Oudin Date: Wed, 4 Feb 2026 10:37:40 +0100 Subject: [PATCH 8/8] fix: remove SH tests --- tests/integration/test_charm.py | 2 -- tests/integration/test_sharding.py | 2 -- 2 files changed, 4 deletions(-) diff --git a/tests/integration/test_charm.py b/tests/integration/test_charm.py index 584a57def..630f3e55e 100644 --- a/tests/integration/test_charm.py +++ b/tests/integration/test_charm.py @@ -23,7 +23,6 @@ MEDIAN_REELECTION_TIME = 12 -@pytest.mark.runner(["self-hosted", "linux", "X64", "jammy", "large"]) @pytest.mark.group(1) @pytest.mark.skipif( os.environ.get("PYTEST_SKIP_DEPLOY", False), @@ -43,7 +42,6 @@ async def test_build_and_deploy(ops_test: OpsTest) -> None: await ops_test.model.wait_for_idle(timeout=DEPLOYMENT_TIMEOUT, status="active") -@pytest.mark.runner(["self-hosted", "linux", "X64", "jammy", "large"]) @pytest.mark.group(1) @pytest.mark.abort_on_fail @pytest.mark.parametrize("unit_id", UNIT_IDS) diff --git a/tests/integration/test_sharding.py b/tests/integration/test_sharding.py index d7f61512a..7e75195c3 100644 --- a/tests/integration/test_sharding.py +++ b/tests/integration/test_sharding.py @@ -30,7 +30,6 @@ TIMEOUT = 30 * 60 -@pytest.mark.runner(["self-hosted", "linux", "X64", "jammy", "large"]) @pytest.mark.group(1) @pytest.mark.abort_on_fail async def test_build_and_deploy(ops_test: OpsTest) -> None: @@ -81,7 +80,6 @@ async def test_build_and_deploy(ops_test: OpsTest) -> None: await wait_for_mongodb_units_blocked(ops_test, SHARD_THREE_APP_NAME, timeout=300) -@pytest.mark.runner(["self-hosted", "linux", "X64", "jammy", "large"]) @pytest.mark.group(1) @pytest.mark.abort_on_fail async def test_cluster_active(ops_test: OpsTest) -> None: