Skip to content

Fix integration tests on non-amd64 hosts and add ARM64 CI #3407

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
thaJeztah merged 2 commits into from
Jun 3, 2026
+23 −0
Merged

Fix integration tests on non-amd64 hosts and add ARM64 CI #3407

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9e9f8ff
Skip tests incompatible with host architecture
vvoland Jun 2, 2026
9b4b9b8
gha: Add arm64 integration CI
vvoland Jun 2, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
5 changes: 5 additions & 0 deletions tests/integration/api_plugin_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import os
import platform

import pytest

Expand All @@ -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):
Expand Down
5 changes: 5 additions & 0 deletions tests/integration/credentials/store_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import os
import platform
import random
import shutil
import sys
Expand All @@ -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:
Expand Down
Loading