Release to 6/edge

canonical · Oct 20, 2023 · f817082 · f817082
1 parent b563ab5
commit f817082
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 24 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -42,7 +42,7 @@ jobs:
 
   build:
     name: Build charms
-    uses: canonical/data-platform-workflows/.github/workflows/build_charms_with_cache.yaml@v5
+    uses: canonical/data-platform-workflows/.github/workflows/build_charm_without_cache.yaml@v5
     with:
       charmcraft-snap-channel: "latest/edge"
 

diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -1,9 +1,9 @@
-name: Release to 5/edge
+name: Release to 6/edge
 
 on:
   push:
     branches:
-      - main
+      - 6/edge
 
 jobs:
   lib-check:
@@ -28,21 +28,22 @@ jobs:
       - lib-check
     uses: ./.github/workflows/ci.yaml
 
-  release-to-charmhub:
-    name: Release to CharmHub
-    needs:
-      - lib-check
-      - ci-tests
-    runs-on: ubuntu-latest
-    timeout-minutes: 60
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-        with:
-          fetch-depth: 0
-      - name: Upload charm to charmhub
-        uses: canonical/charming-actions/upload-charm@2.3.0
-        with:
-          credentials: "${{ secrets.CHARMHUB_TOKEN }}"
-          github-token: "${{ secrets.GITHUB_TOKEN }}"
-          channel: "5/edge"
+   build:
+    name: Build charm
+    uses: canonical/data-platform-workflows/.github/workflows/build_charm_without_cache.yaml@v5
+    with:
+      charmcraft-snap-channel: "latest/edge"
+
+  release:
+      name: Release charm
+      needs:
+        - ci-tests
+        - build
+      uses: canonical/data-platform-workflows/.github/workflows/release_charm.yaml@v5
+      with:
+        channel: 6/edge
+        artifact-name: ${{ needs.build.outputs.artifact-name }}
+      secrets:
+        charmhub-token: ${{ secrets.CHARMHUB_TOKEN }}
+      permissions:
+        contents: write  # Needed to
diff --git a/tests/integration/helpers.py b/tests/integration/helpers.py
@@ -38,6 +38,8 @@
 
 SERIES = "jammy"
 
+HELPER_MONGO_VERSION="6.0.11"
+
 logger = logging.getLogger(__name__)
 
 
@@ -121,9 +123,9 @@ async def run_mongo_op(
         mongo_uri = await mongodb_uri(ops_test)
 
     if stringify:
-        mongo_cmd = f"mongo --quiet --eval 'JSON.stringify({mongo_op})' {mongo_uri}{suffix}"
+        mongo_cmd = f"mongosh --quiet --eval 'JSON.stringify({mongo_op})' {mongo_uri}{suffix}"
     else:
-        mongo_cmd = f"mongo --quiet --eval '{mongo_op}' {mongo_uri}{suffix}"
+        mongo_cmd = f"mongosh --quiet --eval '{mongo_op}' {mongo_uri}{suffix}"
 
     logger.info("Running mongo command: %r", mongo_cmd)
     kubectl_cmd = (
@@ -137,7 +139,7 @@ async def run_mongo_op(
         "--command",
         f"--namespace={ops_test.model_name}",
         "mongo-test",
-        "--image=mongo:4.4",
+        f"--image=mongo:{HELPER_MONGO_VERSION}",
         "--",
         "sh",
         "-c",