From 9663ec644267365da51c59abf886b2a62d3082ba Mon Sep 17 00:00:00 2001 From: Carl Csaposs Date: Thu, 20 Mar 2025 13:09:56 +0100 Subject: [PATCH 1/6] 8.0.40 --- metadata.yaml | 2 +- refresh_versions.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/metadata.yaml b/metadata.yaml index a75205a53..40ae62336 100644 --- a/metadata.yaml +++ b/metadata.yaml @@ -54,6 +54,6 @@ resources: mysql-router-image: type: oci-image description: OCI image for mysql-router - upstream-source: ghcr.io/canonical/charmed-mysql@sha256:089fc04dd2d6f1559161ddf4720c1e06559aeb731ecae57b050c9c816e9833e9 + upstream-source: ghcr.io/canonical/charmed-mysql@sha256:dbba2661ebc38463ca1b9d16edb73cf2575d7da937274d863492a3dfb288c5b7 assumes: - k8s-api diff --git a/refresh_versions.toml b/refresh_versions.toml index d852d9fdf..cd3ec7546 100644 --- a/refresh_versions.toml +++ b/refresh_versions.toml @@ -1,5 +1,5 @@ charm_major = 1 -workload = "8.0.41" +workload = "8.0.40" # autogenerated charm = "8.0/1.0.0" From d666a80be472a4c5a704cc92f9afe7f341638865 Mon Sep 17 00:00:00 2001 From: Carl Csaposs Date: Thu, 20 Mar 2025 13:16:20 +0100 Subject: [PATCH 2/6] Release to Charmhub branch --- .github/workflows/charm_libs.yaml | 33 ---------------------- .github/workflows/check_pr.yaml | 18 ------------ .github/workflows/ci.yaml | 46 +++++-------------------------- 3 files changed, 7 insertions(+), 90 deletions(-) delete mode 100644 .github/workflows/charm_libs.yaml delete mode 100644 .github/workflows/check_pr.yaml diff --git a/.github/workflows/charm_libs.yaml b/.github/workflows/charm_libs.yaml deleted file mode 100644 index b1c108795..000000000 --- a/.github/workflows/charm_libs.yaml +++ /dev/null @@ -1,33 +0,0 @@ -# Copyright 2025 Canonical Ltd. -# See LICENSE file for licensing details. -name: Check libs - -concurrency: - group: ${{ github.workflow }}-${{ github.ref }} - cancel-in-progress: true - -on: - pull_request: - paths-ignore: - - '.gitignore' - - '.jujuignore' - - 'LICENSE' - - '**.md' - - 'renovate.json' - -jobs: - lib-check: - name: Check libraries - runs-on: ubuntu-latest - timeout-minutes: 5 - if: ${{ github.event.pull_request.head.repo.full_name == 'canonical/mysql-router-k8s-operator' }} - steps: - - name: Checkout - uses: actions/checkout@v4 - with: - fetch-depth: 0 - - name: Check libs - uses: canonical/charming-actions/check-libraries@2.7.0 - with: - credentials: "${{ secrets.CHARMHUB_TOKEN }}" - github-token: "${{ secrets.GITHUB_TOKEN }}" diff --git a/.github/workflows/check_pr.yaml b/.github/workflows/check_pr.yaml deleted file mode 100644 index beaa1541a..000000000 --- a/.github/workflows/check_pr.yaml +++ /dev/null @@ -1,18 +0,0 @@ -# Copyright 2025 Canonical Ltd. -# See LICENSE file for licensing details. -name: Check pull request - -on: - pull_request: - types: - - opened - - labeled - - unlabeled - - edited - branches: - - main - -jobs: - check-pr: - name: Check pull request - uses: canonical/data-platform-workflows/.github/workflows/check_charm_pr.yaml@v31.0.0 diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 1d8b214a5..15d613a59 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -2,10 +2,6 @@ # See LICENSE file for licensing details. name: Tests -concurrency: - group: ${{ github.workflow }}-${{ github.ref }} - cancel-in-progress: true - on: pull_request: schedule: @@ -18,46 +14,18 @@ on: value: ${{ jobs.build.outputs.artifact-prefix }} jobs: - lint: - name: Lint - runs-on: ubuntu-latest - timeout-minutes: 5 - steps: - - name: Checkout - uses: actions/checkout@v4 - - name: Install tox & poetry - run: | - pipx install tox - pipx install poetry - - name: Run linters - run: tox run -e lint - - unit-test: - name: Unit test charm - runs-on: ubuntu-22.04 # TODO: use ubuntu-latest after fixing pathlib issue on python 3.12 - timeout-minutes: 20 - steps: - - name: Checkout - uses: actions/checkout@v4 - - name: Install tox & poetry - run: | - pipx install tox - pipx install poetry - - name: Run tests - run: tox run -e unit - build: name: Build charm uses: canonical/data-platform-workflows/.github/workflows/build_charm.yaml@v31.0.0 - integration-test: - name: Integration test charm + release: + name: Release charm needs: - - lint - - unit-test - build - uses: ./.github/workflows/integration_test.yaml + uses: canonical/data-platform-workflows/.github/workflows/release_charm.yaml@v31.0.0 with: + channel: 8.0/edge/test-refresh-v3-8.0.40 artifact-prefix: ${{ needs.build.outputs.artifact-prefix }} - permissions: - contents: write # Needed for Allure Report + create-git-tags: false + secrets: + charmhub-token: ${{ secrets.CHARMHUB_TOKEN }} From 59fc779e96b097b207a054a03046f203571dfadc Mon Sep 17 00:00:00 2001 From: Carl Csaposs Date: Thu, 20 Mar 2025 13:16:33 +0100 Subject: [PATCH 3/6] 8.0.41 --- .github/workflows/ci.yaml | 2 +- metadata.yaml | 2 +- refresh_versions.toml | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 15d613a59..7596da06f 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -24,7 +24,7 @@ jobs: - build uses: canonical/data-platform-workflows/.github/workflows/release_charm.yaml@v31.0.0 with: - channel: 8.0/edge/test-refresh-v3-8.0.40 + channel: 8.0/edge/test-refresh-v3-8.0.41 artifact-prefix: ${{ needs.build.outputs.artifact-prefix }} create-git-tags: false secrets: diff --git a/metadata.yaml b/metadata.yaml index 40ae62336..a75205a53 100644 --- a/metadata.yaml +++ b/metadata.yaml @@ -54,6 +54,6 @@ resources: mysql-router-image: type: oci-image description: OCI image for mysql-router - upstream-source: ghcr.io/canonical/charmed-mysql@sha256:dbba2661ebc38463ca1b9d16edb73cf2575d7da937274d863492a3dfb288c5b7 + upstream-source: ghcr.io/canonical/charmed-mysql@sha256:089fc04dd2d6f1559161ddf4720c1e06559aeb731ecae57b050c9c816e9833e9 assumes: - k8s-api diff --git a/refresh_versions.toml b/refresh_versions.toml index cd3ec7546..e3c1e4ab0 100644 --- a/refresh_versions.toml +++ b/refresh_versions.toml @@ -1,5 +1,5 @@ charm_major = 1 -workload = "8.0.40" +workload = "8.0.41" # autogenerated -charm = "8.0/1.0.0" +charm = "8.0/1.1.0" From e1e754e4ea6bcf75166b997355cba804cca9f285 Mon Sep 17 00:00:00 2001 From: Carl Csaposs Date: Thu, 20 Mar 2025 16:52:45 +0100 Subject: [PATCH 4/6] incompat --- .github/workflows/ci.yaml | 2 +- refresh_versions.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 7596da06f..1f84b2741 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -24,7 +24,7 @@ jobs: - build uses: canonical/data-platform-workflows/.github/workflows/release_charm.yaml@v31.0.0 with: - channel: 8.0/edge/test-refresh-v3-8.0.41 + channel: 8.0/edge/test-refresh-v3-incompat artifact-prefix: ${{ needs.build.outputs.artifact-prefix }} create-git-tags: false secrets: diff --git a/refresh_versions.toml b/refresh_versions.toml index e3c1e4ab0..d33a6faae 100644 --- a/refresh_versions.toml +++ b/refresh_versions.toml @@ -2,4 +2,4 @@ charm_major = 1 workload = "8.0.41" # autogenerated -charm = "8.0/1.1.0" +charm = "8.0/2.0.0" From a37e52dee9c83d265afd087f51f1c7bdfc0c07f8 Mon Sep 17 00:00:00 2001 From: Carl Csaposs Date: Thu, 20 Mar 2025 16:53:43 +0100 Subject: [PATCH 5/6] precheckfail --- .github/workflows/ci.yaml | 2 +- refresh_versions.toml | 2 +- src/abstract_charm.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 1f84b2741..1896e4b47 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -24,7 +24,7 @@ jobs: - build uses: canonical/data-platform-workflows/.github/workflows/release_charm.yaml@v31.0.0 with: - channel: 8.0/edge/test-refresh-v3-incompat + channel: 8.0/edge/test-refresh-v3-precheckfail artifact-prefix: ${{ needs.build.outputs.artifact-prefix }} create-git-tags: false secrets: diff --git a/refresh_versions.toml b/refresh_versions.toml index d33a6faae..953b163f0 100644 --- a/refresh_versions.toml +++ b/refresh_versions.toml @@ -2,4 +2,4 @@ charm_major = 1 workload = "8.0.41" # autogenerated -charm = "8.0/2.0.0" +charm = "8.0/1.2.0" diff --git a/src/abstract_charm.py b/src/abstract_charm.py index d0492d5b8..d707680a7 100644 --- a/src/abstract_charm.py +++ b/src/abstract_charm.py @@ -30,7 +30,7 @@ class RouterRefresh(charm_refresh.CharmSpecificCommon, abc.ABC): @staticmethod def run_pre_refresh_checks_after_1_unit_refreshed() -> None: - pass + raise charm_refresh.PrecheckFailed("Backup in progress") @classmethod def is_compatible( From 81871f2cbb15e7ca7f54b531489ef8c1d97215f7 Mon Sep 17 00:00:00 2001 From: Carl Csaposs Date: Thu, 20 Mar 2025 16:54:00 +0100 Subject: [PATCH 6/6] uncaught --- .github/workflows/ci.yaml | 2 +- refresh_versions.toml | 2 +- src/abstract_charm.py | 2 +- src/charm.py | 1 + 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 1896e4b47..21f711320 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -24,7 +24,7 @@ jobs: - build uses: canonical/data-platform-workflows/.github/workflows/release_charm.yaml@v31.0.0 with: - channel: 8.0/edge/test-refresh-v3-precheckfail + channel: 8.0/edge/test-refresh-v3-uncaught artifact-prefix: ${{ needs.build.outputs.artifact-prefix }} create-git-tags: false secrets: diff --git a/refresh_versions.toml b/refresh_versions.toml index 953b163f0..7e48d10e1 100644 --- a/refresh_versions.toml +++ b/refresh_versions.toml @@ -2,4 +2,4 @@ charm_major = 1 workload = "8.0.41" # autogenerated -charm = "8.0/1.2.0" +charm = "8.0/1.3.0" diff --git a/src/abstract_charm.py b/src/abstract_charm.py index d707680a7..d0492d5b8 100644 --- a/src/abstract_charm.py +++ b/src/abstract_charm.py @@ -30,7 +30,7 @@ class RouterRefresh(charm_refresh.CharmSpecificCommon, abc.ABC): @staticmethod def run_pre_refresh_checks_after_1_unit_refreshed() -> None: - raise charm_refresh.PrecheckFailed("Backup in progress") + pass @classmethod def is_compatible( diff --git a/src/charm.py b/src/charm.py index b1db808c9..f9aaafd8f 100755 --- a/src/charm.py +++ b/src/charm.py @@ -119,6 +119,7 @@ def __init__(self, *args) -> None: self._reconcile_allowed = False else: self._reconcile_allowed = True + raise Exception @property def _subordinate_relation_endpoint_names(self) -> typing.Optional[typing.Iterable[str]]: