From 3e35aee4f8b728b44801d54253e9e16bb603a400 Mon Sep 17 00:00:00 2001 From: Ben Hoyt Date: Fri, 31 May 2024 00:13:07 +0200 Subject: [PATCH 1/3] docs: add release step to update pinned charm tests (#1213) We will switch to using pinned versions of the charm (latest `main`) for our charm tests in the GitHub Actions. This PR adds a release step to update the pinned versions, and what to do if they fail. --------- Co-authored-by: Tony Meyer Co-authored-by: Dima Tisnek --- HACKING.md | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/HACKING.md b/HACKING.md index b169960c8..468aaab24 100644 --- a/HACKING.md +++ b/HACKING.md @@ -293,13 +293,16 @@ To make a release of the ops library, do the following: link to the full changelog. 8. Change [version.py][ops/version.py]'s `version` to the [appropriate string](https://semver.org/). -9. Add, commit, and push, and open a PR to get the changelog and version bump +9. Check if there's a `chore: update charm pins` auto-generated PR in the queue. If it looks + good, merge it and check that tests still pass. If needed, you can re-trigger the + `Update Charm Pins` workflow manually to ensure latest charms and ops get tested. +10. Add, commit, and push, and open a PR to get the changelog and version bump into main (and get it merged). -10. Back in the GitHub releases page, tweak the release notes - for example, +11. Back in the GitHub releases page, tweak the release notes - for example, you might want to have a short paragraph at the intro on particularly noteworthy changes. -11. Have someone else in the Charm-Tech team proofread the release notes. -12. When you are ready, click "Publish". (If you are not ready, click "Save as Draft".) +12. Have someone else in the Charm-Tech team proofread the release notes. +13. When you are ready, click "Publish". (If you are not ready, click "Save as Draft".) This will trigger an automatic build for the Python package and publish it to [PyPI](https://pypi.org/project/ops/)) (authorisation is handled via a From e3b5218e91767419565b92556f69bd5706f9baa7 Mon Sep 17 00:00:00 2001 From: Ben Hoyt Date: Fri, 31 May 2024 05:51:53 +0200 Subject: [PATCH 2/3] chore: update charm pins (#1237) This is an automated PR to update pins of the external repositories that the operator framework is tested against Co-authored-by: github-actions --- .github/workflows/db-charm-tests.yaml | 4 ++-- .github/workflows/observability-charm-tests.yaml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/db-charm-tests.yaml b/.github/workflows/db-charm-tests.yaml index f4c72fd0b..3b61f535e 100644 --- a/.github/workflows/db-charm-tests.yaml +++ b/.github/workflows/db-charm-tests.yaml @@ -10,9 +10,9 @@ jobs: matrix: include: - charm-repo: canonical/postgresql-operator - commit: 4feeaeee102cbf5e3dada3c05d44e0495ca68f9a # rev409 2024-05-21T12:52:24Z + commit: ce40968c98da939c13dc92dfc21f2c763ec6d4f1 # rev413 2024-05-27T17:19:14Z - charm-repo: canonical/postgresql-k8s-operator - commit: 1a25c3929747beea7e78467b169b2b345b29d470 # 2024-05-21T12:40:19Z + commit: 582b3b9975b66fb4d1faa3163c485876998b0b91 # rev257 2024-05-25T14:09:32Z - charm-repo: canonical/mysql-operator commit: 19633f3e904d1c3296477b3df191d1ca265fc0d5 # rev234 2024-05-06T12:13:54Z - charm-repo: canonical/mysql-k8s-operator diff --git a/.github/workflows/observability-charm-tests.yaml b/.github/workflows/observability-charm-tests.yaml index 33bb64f16..ff9e3916d 100644 --- a/.github/workflows/observability-charm-tests.yaml +++ b/.github/workflows/observability-charm-tests.yaml @@ -11,7 +11,7 @@ jobs: matrix: include: - charm-repo: canonical/alertmanager-k8s-operator - commit: 90b85c79dfdeeeedcc538c92dcbc26fb2b931088 # rev114 2024-05-23T12:09:22Z + commit: 75bb9766eb22b2a0d6447d0e41969c930fc3940d # rev115 2024-05-28T11:25:11Z - charm-repo: canonical/prometheus-k8s-operator commit: 41b10003b2e7aba34e26fa387af4297d97ecb535 # rev189 2024-05-21T21:25:20Z - charm-repo: canonical/grafana-k8s-operator From 758d989069e2e39187fae66562b0e18bb7bca609 Mon Sep 17 00:00:00 2001 From: Ben Hoyt Date: Tue, 4 Jun 2024 11:38:30 +1200 Subject: [PATCH 3/3] chore: update charm pins (#1243) This is an automated PR to update pins of the external repositories that the operator framework is tested against Co-authored-by: github-actions --- .github/workflows/db-charm-tests.yaml | 6 +++--- .github/workflows/observability-charm-tests.yaml | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/db-charm-tests.yaml b/.github/workflows/db-charm-tests.yaml index 3b61f535e..81aa3ff2a 100644 --- a/.github/workflows/db-charm-tests.yaml +++ b/.github/workflows/db-charm-tests.yaml @@ -10,13 +10,13 @@ jobs: matrix: include: - charm-repo: canonical/postgresql-operator - commit: ce40968c98da939c13dc92dfc21f2c763ec6d4f1 # rev413 2024-05-27T17:19:14Z + commit: 85f92e9a7121a1f506a550662c066343612a29e6 # 2024-05-31T11:54:37Z - charm-repo: canonical/postgresql-k8s-operator - commit: 582b3b9975b66fb4d1faa3163c485876998b0b91 # rev257 2024-05-25T14:09:32Z + commit: 7e8862e2f02cfe1f8e768d6ad54a281833afdfda # rev268 2024-05-31T11:54:09Z - charm-repo: canonical/mysql-operator commit: 19633f3e904d1c3296477b3df191d1ca265fc0d5 # rev234 2024-05-06T12:13:54Z - charm-repo: canonical/mysql-k8s-operator - commit: 6c09910bc3bd88eb632793d08fa17340c6903cb2 # rev138 2024-05-01T18:08:13Z + commit: d310ba925b667345dc2d1b9b5c953881dd14322a # 2024-05-29T12:07:56Z steps: - name: Checkout the ${{ matrix.charm-repo }} repository uses: actions/checkout@v4 diff --git a/.github/workflows/observability-charm-tests.yaml b/.github/workflows/observability-charm-tests.yaml index ff9e3916d..b3e4bd2c2 100644 --- a/.github/workflows/observability-charm-tests.yaml +++ b/.github/workflows/observability-charm-tests.yaml @@ -11,11 +11,11 @@ jobs: matrix: include: - charm-repo: canonical/alertmanager-k8s-operator - commit: 75bb9766eb22b2a0d6447d0e41969c930fc3940d # rev115 2024-05-28T11:25:11Z + commit: 81612b18bf4e9cee072387e75ebd34dff3c189ce # rev119 2024-06-02T12:08:25Z - charm-repo: canonical/prometheus-k8s-operator commit: 41b10003b2e7aba34e26fa387af4297d97ecb535 # rev189 2024-05-21T21:25:20Z - charm-repo: canonical/grafana-k8s-operator - commit: ec74910fc60848594ce44da3b549ad18aa6528aa # rev113 2024-05-21T14:31:49Z + commit: fd6a7da88fa044709be69a4c733d879eb7175b54 # rev114 2024-05-29T09:55:04Z steps: - name: Checkout the ${{ matrix.charm-repo }} repository uses: actions/checkout@v4