Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

update ci/workflows for snap error #285

Merged
merged 1 commit into from
Oct 27, 2023
Merged

update ci/workflows for snap error #285

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/ci.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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
Expand Down
2 changes: 0 additions & 2 deletions tests/integration/conftest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
16 changes: 8 additions & 8 deletions tox.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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/[email protected]\#subdirectory=python/pytest_plugins/pytest_operator_cache
dmitry-ratushnyy marked this conversation as resolved.
Show resolved Hide resolved
pytest-mock
-r {tox_root}/requirements.txt
commands =
Expand All @@ -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/[email protected]\#subdirectory=python/pytest_plugins/pytest_operator_cache
MiaAltieri marked this conversation as resolved.
Show resolved Hide resolved
pytest-operator
-r {tox_root}/requirements.txt
commands =
Expand All @@ -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/[email protected]\#subdirectory=python/pytest_plugins/pytest_operator_cache
pytest-operator
-r {tox_root}/requirements.txt
commands =
Expand All @@ -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/[email protected]\#subdirectory=python/pytest_plugins/pytest_operator_cache
pytest-operator
-r {tox_root}/requirements.txt
commands =
Expand All @@ -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/[email protected]\#subdirectory=python/pytest_plugins/pytest_operator_cache
pytest-operator
-r {tox_root}/requirements.txt
commands =
Expand All @@ -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
Expand All @@ -157,6 +156,7 @@ deps =
pytest
juju==3.2.0.1
pytest-mock
git+https://github.com/canonical/[email protected]\#subdirectory=python/pytest_plugins/pytest_operator_cache
pytest-operator
-r {tox_root}/requirements.txt
commands =
Expand All @@ -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/[email protected]\#subdirectory=python/pytest_plugins/pytest_operator_cache
pytest-operator
-r {tox_root}/requirements.txt
commands =
Expand All @@ -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/[email protected]\#subdirectory=python/pytest_plugins/pytest_operator_cache
pytest-operator
-r {tox_root}/requirements.txt
commands =
Expand Down
Loading