Run integration tests on arm64 (#36)

canonical · May 29, 2024 · 12dae88 · 12dae88
1 parent 16f7e9a
commit 12dae88
Show file tree

Hide file tree

Showing 7 changed files with 29 additions and 39 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -16,7 +16,7 @@ on:
 jobs:
   lint:
     name: Lint
-    uses: canonical/data-platform-workflows/.github/workflows/lint.yaml@v13.0.0
+    uses: canonical/data-platform-workflows/.github/workflows/lint.yaml@v13.3.0
 
   unit-test:
     name: Unit tests
@@ -39,7 +39,7 @@ jobs:
           - .
           - tests/integration/application-charm
     name: Build charm
-    uses: canonical/data-platform-workflows/.github/workflows/build_charm.yaml@v13.0.0
+    uses: canonical/data-platform-workflows/.github/workflows/build_charm.yaml@v13.3.0
     with:
       path-to-charm-directory: ${{ matrix.path }}
       cache: true
@@ -49,20 +49,24 @@ jobs:
       fail-fast: false
       matrix:
         juju:
-          - agent: 2.9.46
+          - agent: 2.9.49
             libjuju: ^2
-          - agent: 3.1.7
+          - agent: 3.1.8
         cloud:
           - lxd
           - microk8s
-    name: Integration test charm | ${{ matrix.juju.agent }} | ${{ matrix.cloud }}
+        architecture:
+          - amd64
+          - arm64
+    name: Integration test charm | ${{ matrix.juju.agent }} | ${{ matrix.cloud }} | ${{ matrix.architecture }}
     needs:
       - lint
       - unit-test
       - build
-    uses: canonical/data-platform-workflows/.github/workflows/integration_test_charm.yaml@v13.0.0
+    uses: canonical/data-platform-workflows/.github/workflows/integration_test_charm.yaml@v13.3.0
     with:
       artifact-prefix: packed-charm-cache-true
+      architecture: ${{ matrix.architecture }}
       cloud: ${{ matrix.cloud }}
       juju-agent-version: ${{ matrix.juju.agent }}
       libjuju-version-constraint: ${{ matrix.juju.libjuju }}

diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -35,15 +35,15 @@ jobs:
 
   build:
     name: Build charm
-    uses: canonical/data-platform-workflows/.github/workflows/build_charm.yaml@v13.0.0
+    uses: canonical/data-platform-workflows/.github/workflows/build_charm.yaml@v13.3.0
 
   release-to-charmhub:
     name: Release to CharmHub
     needs:
       - lib-check
       - ci-tests
       - build
-    uses: canonical/data-platform-workflows/.github/workflows/release_charm.yaml@v13.0.0
+    uses: canonical/data-platform-workflows/.github/workflows/release_charm.yaml@v13.3.0
     with:
       channel: latest/edge
       artifact-prefix: ${{ needs.build.outputs.artifact-prefix }}

diff --git a/.github/workflows/sync_issue_to_jira.yaml b/.github/workflows/sync_issue_to_jira.yaml
@@ -9,7 +9,7 @@ on:
 jobs:
   sync:
     name: Sync GitHub issue to Jira
-    uses: canonical/data-platform-workflows/.github/workflows/sync_issue_to_jira.yaml@v13.0.0
+    uses: canonical/data-platform-workflows/.github/workflows/sync_issue_to_jira.yaml@v13.3.0
     with:
       jira-base-url: https://warthogs.atlassian.net
       jira-project-key: DPE

diff --git a/poetry.lock b/poetry.lock
diff --git a/pyproject.toml b/pyproject.toml
@@ -40,10 +40,10 @@ parameterized = "^0.9.0"
 
 [tool.poetry.group.integration.dependencies]
 pytest = "^8.1.1"
-pytest-github-secrets = {git = "https://github.com/canonical/data-platform-workflows", tag = "v13.0.0", subdirectory = "python/pytest_plugins/github_secrets"}
+pytest-github-secrets = {git = "https://github.com/canonical/data-platform-workflows", tag = "v13.3.0", subdirectory = "python/pytest_plugins/github_secrets"}
 pytest-operator = "^0.34.0"
-pytest-operator-cache = {git = "https://github.com/canonical/data-platform-workflows", tag = "v13.0.0", subdirectory = "python/pytest_plugins/pytest_operator_cache"}
-pytest-operator-groups = {git = "https://github.com/canonical/data-platform-workflows", tag = "v13.0.0", subdirectory = "python/pytest_plugins/pytest_operator_groups"}
+pytest-operator-cache = {git = "https://github.com/canonical/data-platform-workflows", tag = "v13.3.0", subdirectory = "python/pytest_plugins/pytest_operator_cache"}
+pytest-operator-groups = {git = "https://github.com/canonical/data-platform-workflows", tag = "v13.3.0", subdirectory = "python/pytest_plugins/pytest_operator_groups"}
 juju = "^3.3.1.1"
 
 # Testing tools configuration

diff --git a/tests/integration/application-charm/charmcraft.yaml b/tests/integration/application-charm/charmcraft.yaml
@@ -3,12 +3,12 @@
 
 type: charm
 bases:
-  - build-on:
-      - name: "ubuntu"
-        channel: "20.04"
-    run-on:
-      - name: "ubuntu"
-        channel: "20.04"
+  - name: ubuntu
+    channel: "22.04"
+    architectures: [amd64]
+  - name: ubuntu
+    channel: "22.04"
+    architectures: [arm64]
 
 parts:
   charm:

diff --git a/tests/integration/application-charm/metadata.yaml b/tests/integration/application-charm/metadata.yaml
@@ -7,9 +7,6 @@ summary: |
   Data platform libs application meant to be used
   only for testing of the libs in this repository.
 
-series:
-  - focal
-
 requires:
   first-s3-credentials:
     interface: s3