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

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@v32.1.0
+    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@v32.1.0
+    uses: canonical/data-platform-workflows/.github/workflows/check_charm_pr.yaml@v32.2.0

.github/workflows/ci.yaml

@@ -55,7 +55,7 @@ jobs:
 
   build:
     name: Build charm
-    uses: canonical/data-platform-workflows/.github/workflows/build_charm.yaml@v32.1.0
+    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@v32.1.0
+    uses: canonical/data-platform-workflows/.github/workflows/_promote_charm.yaml@v32.2.0
     with:
       track: 'dpe'
       from-risk: ${{ inputs.from-risk }}

.github/workflows/release.yaml

@@ -15,7 +15,7 @@ on:
 jobs:
   tag:
     name: Create charm refresh compatibility version git tag
-    uses: canonical/data-platform-workflows/.github/workflows/tag_charm_edge.yaml@v32.1.0
+    uses: canonical/data-platform-workflows/.github/workflows/tag_charm_edge.yaml@v32.2.0
     with:
       track: 'dpe'
     permissions:
@@ -35,7 +35,7 @@ jobs:
     needs:
       - tag
       - ci-tests
-    uses: canonical/data-platform-workflows/.github/workflows/release_charm_edge.yaml@v32.1.0
+    uses: canonical/data-platform-workflows/.github/workflows/release_charm_edge.yaml@v32.2.0
     with:
       track: ${{ needs.tag.outputs.track }}
       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@v32.1.0
+    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:
   [email protected]:amd64:
   [email protected]:arm64:
+  [email protected]:s390x:
 # Files implicitly created by charmcraft without a part:
 # - dispatch (https://github.com/canonical/charmcraft/pull/1898)
 # - manifest.yaml

refresh_versions.toml

@@ -1,13 +1,15 @@
 # https://canonical-charm-refresh.readthedocs-hosted.com/latest/refresh-versions-toml/
 
 charm_major = 1
-workload = "8.0.41"
+workload = "8.0.42"
 
 [snap]
 name = "charmed-mysql"
 
 [snap.revisions]
 # amd64
-x86_64 = "139"
+x86_64 = "151"
 # arm64
-aarch64 = "138"
+aarch64 = "153"
+# s390x
+s390x = "152"

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

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