Update Router to 8.0.42 & add s390x arch (#455)

Since there are only 3 IS-hosted s390x github runners, will add s390x
integration tests in a separate PR to avoid blocking PRs

Author: carlcsaposs-canonical

.github/workflows/approve_renovate_pr.yaml

@@ -10,6 +10,6 @@ on:
 jobs:
   approve-pr:
     name: Approve Renovate pull request
-    uses: canonical/data-platform-workflows/.github/workflows/approve_renovate_pr.yaml@v31.1.1
+    uses: canonical/data-platform-workflows/.github/workflows/approve_renovate_pr.yaml@v32.2.0
     permissions:
       pull-requests: write  # Needed to approve PR

.github/workflows/check_pr.yaml

@@ -15,4 +15,4 @@ on:
 jobs:
   check-pr:
     name: Check pull request
-    uses: canonical/data-platform-workflows/.github/workflows/check_charm_pr.yaml@v31.1.1
+    uses: canonical/data-platform-workflows/.github/workflows/check_charm_pr.yaml@v32.2.0

.github/workflows/ci.yaml

@@ -53,7 +53,7 @@ jobs:
 
   build:
     name: Build charm
-    uses: canonical/data-platform-workflows/.github/workflows/build_charm.yaml@v31.1.1
+    uses: canonical/data-platform-workflows/.github/workflows/build_charm.yaml@v32.2.0
 
   integration-test:
     name: Integration test charm

.github/workflows/promote.yaml

@@ -25,7 +25,7 @@ on:
 jobs:
   promote:
     name: Promote charm
-    uses: canonical/data-platform-workflows/.github/workflows/_promote_charm.yaml@v31.1.1
+    uses: canonical/data-platform-workflows/.github/workflows/_promote_charm.yaml@v31.1.1  # Use v32 after this charm adds refresh v3
     with:
       track: '8.0'
       from-risk: ${{ inputs.from-risk }}

.github/workflows/release.yaml

@@ -22,7 +22,7 @@ jobs:
     name: Release charm
     needs:
       - ci-tests
-    uses: canonical/data-platform-workflows/.github/workflows/release_charm.yaml@v31.1.1
+    uses: canonical/data-platform-workflows/.github/workflows/release_charm.yaml@v32.2.0
     with:
       channel: 8.0/edge
       artifact-prefix: ${{ needs.ci-tests.outputs.artifact-prefix }}

.github/workflows/sync_docs.yaml

@@ -10,7 +10,7 @@ on:
 jobs:
   sync-docs:
     name: Sync docs from Discourse
-    uses: canonical/data-platform-workflows/.github/workflows/sync_docs.yaml@v31.1.1
+    uses: canonical/data-platform-workflows/.github/workflows/sync_docs.yaml@v32.2.0
     with:
       reviewers: a-velasco
     permissions:

charmcraft.yaml

@@ -5,6 +5,7 @@ type: charm
 platforms:
   ubuntu@22.04:amd64:
   ubuntu@22.04:arm64:
+  ubuntu@22.04:s390x:
 # Files implicitly created by charmcraft without a part:
 # - dispatch (https://github.com/canonical/charmcraft/pull/1898)
 # - manifest.yaml

metadata.yaml

@@ -60,6 +60,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:e78bdba30923ec87d67879a284d9162dfbb7600b34cbf3f84c9b4cce08648715
 assumes:
   - k8s-api

src/architecture.py

@@ -51,8 +51,10 @@ def is_wrong_architecture() -> bool:
         manifest_archs.extend(base_archs)
 
     hardware_arch = platform.machine()
-    if ("amd64" in manifest_archs and hardware_arch == "x86_64") or (
-        "arm64" in manifest_archs and hardware_arch == "aarch64"
+    if (
+        ("amd64" in manifest_archs and hardware_arch == "x86_64")
+        or ("arm64" in manifest_archs and hardware_arch == "aarch64")
+        or ("s390x" in manifest_archs and hardware_arch == "s390x")
     ):
         logger.debug("Charm architecture matches")
         return False

tests/integration/test_architecture.py

@@ -59,3 +59,6 @@ async def test_amd_charm_on_arm_host(ops_test: OpsTest) -> None:
         status="error",
         raise_on_error=False,
     )
+
+
+# TODO: add s390x test