Skip to content

Commit

Permalink
test dpw branch
Browse files Browse the repository at this point in the history
  • Loading branch information
carlcsaposs-canonical committed Dec 5, 2024
1 parent c6bbc0c commit c907c52
Show file tree
Hide file tree
Showing 4 changed files with 28 additions and 34 deletions.
14 changes: 13 additions & 1 deletion .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ jobs:

build:
name: Build charm
uses: canonical/data-platform-workflows/.github/workflows/build_charm.yaml@v23.1.1
uses: canonical/data-platform-workflows/.github/workflows/build_charm.yaml@beta-charmcraftst124
with:
# Use of cache blocked by https://github.com/canonical/charmcraft/issues/1456
# Details: https://github.com/canonical/charmcraftcache/issues/3
Expand All @@ -75,6 +75,18 @@ jobs:
# Needed to avoid conflict with artifact name on release CI
artifact-prefix: ci-packed-charm-cache-false-.

release:
name: Release charm
needs:
- build
uses: canonical/data-platform-workflows/.github/workflows/release_charm.yaml@beta-charmcraftst124
with:
channel: dpe/edge/test-charmcraftst124
artifact-prefix: ${{ needs.build.outputs.artifact-prefix }}
create-github-release: false
secrets:
charmhub-token: ${{ secrets.CHARMHUB_TOKEN }}

gh-hosted-collect-integration-tests:
name: (GH hosted) Collect integration test groups
needs:
Expand Down
19 changes: 6 additions & 13 deletions charmcraft.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,19 +2,12 @@
# See LICENSE file for licensing details.

type: charm
bases:
# Whenever "bases" is changed:
# - Update tests/conftest.py::pytest_configure()
# - Update .github/workflow/ci.yaml integration-test matrix
- name: ubuntu
channel: "20.04"
architectures: [amd64]
- name: ubuntu
channel: "22.04"
architectures: [amd64]
- name: ubuntu
channel: "22.04"
architectures: [arm64]
platforms:
[email protected]:amd64:
[email protected]:amd64:
[email protected]:arm64:
[email protected]:amd64:
[email protected]:arm64:
parts:
files:
plugin: dump
Expand Down
27 changes: 8 additions & 19 deletions poetry.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ pytest-mock = "^3.14.0"
[tool.poetry.group.integration.dependencies]
pytest = "^8.2.2"
pytest-operator = "^0.35.0"
pytest-operator-cache = {git = "https://github.com/canonical/data-platform-workflows", tag = "v23.1.1", subdirectory = "python/pytest_plugins/pytest_operator_cache"}
pytest-operator-cache = {git = "https://github.com/canonical/data-platform-workflows", branch = "beta-charmcraftst124", subdirectory = "python/pytest_plugins/pytest_operator_cache"}
pytest-operator-groups = {git = "https://github.com/canonical/data-platform-workflows", tag = "v23.1.1", subdirectory = "python/pytest_plugins/pytest_operator_groups"}
pytest-github-secrets = {git = "https://github.com/canonical/data-platform-workflows", tag = "v23.1.1", subdirectory = "python/pytest_plugins/github_secrets"}
juju = "^3.5.2.0"
Expand Down

0 comments on commit c907c52

Please sign in to comment.