Skip to content

Commit

Permalink
update ci/workflows for snap error (#285)
Browse files Browse the repository at this point in the history
## Issue
CI has an occasional issue with snap-install, which is fixed in new
data-platform workflows

## Solution
Update workflows + deps
  • Loading branch information
MiaAltieri authored Oct 27, 2023
1 parent 2f6f9cd commit 017056b
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 12 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/ci.yaml
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
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
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
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
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

0 comments on commit 017056b

Please sign in to comment.