From 9e9f8ff315fe405d7f7e89b394d6269217c51dfe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pawe=C5=82=20Gronowski?= Date: Tue, 2 Jun 2026 19:56:25 +0200 Subject: [PATCH 1/2] Skip tests incompatible with host architecture MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Don't run tests that run native amd64 binaries on hosts with other architectures. Signed-off-by: Paweł Gronowski --- tests/integration/api_plugin_test.py | 5 +++++ tests/integration/credentials/store_test.py | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/tests/integration/api_plugin_test.py b/tests/integration/api_plugin_test.py index 168c81b231..cc5c8d3d2e 100644 --- a/tests/integration/api_plugin_test.py +++ b/tests/integration/api_plugin_test.py @@ -1,4 +1,5 @@ import os +import platform import pytest @@ -11,6 +12,10 @@ @requires_api_version('1.25') +@pytest.mark.skipif( + platform.machine().lower() not in ('amd64', 'x86_64'), + reason='vieux/sshfs plugin is only supported on amd64', +) class PluginTest(BaseAPIIntegrationTest): @classmethod def teardown_class(cls): diff --git a/tests/integration/credentials/store_test.py b/tests/integration/credentials/store_test.py index e1eba33a18..a9cb51469c 100644 --- a/tests/integration/credentials/store_test.py +++ b/tests/integration/credentials/store_test.py @@ -1,4 +1,5 @@ import os +import platform import random import shutil import sys @@ -14,6 +15,10 @@ ) +@pytest.mark.skipif( + platform.machine().lower() not in ('amd64', 'x86_64'), + reason='docker-credential-pass test helper is only supported on amd64', +) class TestStore: def teardown_method(self): for server in self.tmp_keys: From 9b4b9b8461966e5b54638490e66c91e45f25ea19 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pawe=C5=82=20Gronowski?= Date: Tue, 2 Jun 2026 20:08:45 +0200 Subject: [PATCH 2/2] gha: Add arm64 integration CI MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Paweł Gronowski --- .github/workflows/ci.yml | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 50727826b7..dac54e8c25 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -70,3 +70,16 @@ jobs: docker logout rm -rf ~/.docker make ${{ matrix.variant }} + + arm64-integration-tests: + runs-on: ubuntu-24.04-arm + steps: + - uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4.3.1 + with: + fetch-depth: 0 + fetch-tags: true + - name: make integration-dind + run: | + docker logout + rm -rf ~/.docker + make integration-dind