diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 848b833f4..2ef05698d 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -68,7 +68,7 @@ jobs: build: name: Build charms - uses: canonical/data-platform-workflows/.github/workflows/build_charms_with_cache.yaml@v2 + uses: canonical/data-platform-workflows/.github/workflows/build_charms_with_cache.yaml@v5.1.2 integration-test: strategy: @@ -104,7 +104,7 @@ jobs: uses: actions/download-artifact@v3 with: name: ${{ needs.build.outputs.artifact-name }} - + - name: Free up disk space run: | # From https://github.com/actions/runner-images/issues/2840#issuecomment-790492173 diff --git a/tests/integration/conftest.py b/tests/integration/conftest.py index a4a50afcc..f859f8168 100644 --- a/tests/integration/conftest.py +++ b/tests/integration/conftest.py @@ -6,11 +6,9 @@ import os from pathlib import Path -import pytest from pytest_operator.plugin import OpsTest -@pytest.fixture(scope="module") def ops_test(ops_test: OpsTest) -> OpsTest: if os.environ.get("CI") == "true": # Running in GitHub Actions; skip build step diff --git a/tox.ini b/tox.ini index c89fdca5b..a5b2c0100 100644 --- a/tox.ini +++ b/tox.ini @@ -72,11 +72,11 @@ description = Run charm integration tests pass_env = {[testenv]pass_env} CI - CI_PACKED_CHARMS deps = pytest juju==3.2.0.1 pytest-operator + git+https://github.com/canonical/data-platform-workflows@v5.1.2\#subdirectory=python/pytest_plugins/pytest_operator_cache pytest-mock -r {tox_root}/requirements.txt commands = @@ -87,11 +87,11 @@ description = Run high availability integration tests pass_env = {[testenv]pass_env} CI - CI_PACKED_CHARMS deps = pytest juju==3.2.0.1 pytest-mock + git+https://github.com/canonical/data-platform-workflows@v5.1.2\#subdirectory=python/pytest_plugins/pytest_operator_cache pytest-operator -r {tox_root}/requirements.txt commands = @@ -102,11 +102,11 @@ description = Run new relation integration tests pass_env = {[testenv]pass_env} CI - CI_PACKED_CHARMS deps = pytest juju==3.2.0.1 pytest-mock + git+https://github.com/canonical/data-platform-workflows@v5.1.2\#subdirectory=python/pytest_plugins/pytest_operator_cache pytest-operator -r {tox_root}/requirements.txt commands = @@ -117,11 +117,11 @@ description = Run legacy relation integration tests pass_env = {[testenv]pass_env} CI - CI_PACKED_CHARMS deps = pytest juju==3.2.0.1 pytest-mock + git+https://github.com/canonical/data-platform-workflows@v5.1.2\#subdirectory=python/pytest_plugins/pytest_operator_cache pytest-operator -r {tox_root}/requirements.txt commands = @@ -132,11 +132,11 @@ description = Run tls integration tests pass_env = {[testenv]pass_env} CI - CI_PACKED_CHARMS deps = pytest juju==3.2.0.1 pytest-mock + git+https://github.com/canonical/data-platform-workflows@v5.1.2\#subdirectory=python/pytest_plugins/pytest_operator_cache pytest-operator -r {tox_root}/requirements.txt commands = @@ -148,7 +148,6 @@ description = Run backup integration tests pass_env = {[testenv]pass_env} CI - CI_PACKED_CHARMS AWS_ACCESS_KEY AWS_SECRET_KEY GCP_ACCESS_KEY @@ -157,6 +156,7 @@ deps = pytest juju==3.2.0.1 pytest-mock + git+https://github.com/canonical/data-platform-workflows@v5.1.2\#subdirectory=python/pytest_plugins/pytest_operator_cache pytest-operator -r {tox_root}/requirements.txt commands = @@ -167,11 +167,11 @@ description = Run metrics integration tests pass_env = {[testenv]pass_env} CI - CI_PACKED_CHARMS deps = pytest juju==3.2.0.1 pytest-mock + git+https://github.com/canonical/data-platform-workflows@v5.1.2\#subdirectory=python/pytest_plugins/pytest_operator_cache pytest-operator -r {tox_root}/requirements.txt commands = @@ -183,11 +183,11 @@ description = Run all integration tests pass_env = {[testenv]pass_env} CI - CI_PACKED_CHARMS deps = pytest juju==3.2.0.1 pytest-mock + git+https://github.com/canonical/data-platform-workflows@v5.1.2\#subdirectory=python/pytest_plugins/pytest_operator_cache pytest-operator -r {tox_root}/requirements.txt commands =