Skip to content

Commit 059d371

Browse files
authored
Merge pull request #3407 from vvoland/fix-arm64
Fix integration tests on non-amd64 hosts and add ARM64 CI
2 parents e0542d9 + 9b4b9b8 commit 059d371

3 files changed

Lines changed: 23 additions & 0 deletions

File tree

.github/workflows/ci.yml

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,3 +70,16 @@ jobs:
7070
docker logout
7171
rm -rf ~/.docker
7272
make ${{ matrix.variant }}
73+
74+
arm64-integration-tests:
75+
runs-on: ubuntu-24.04-arm
76+
steps:
77+
- uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4.3.1
78+
with:
79+
fetch-depth: 0
80+
fetch-tags: true
81+
- name: make integration-dind
82+
run: |
83+
docker logout
84+
rm -rf ~/.docker
85+
make integration-dind

tests/integration/api_plugin_test.py

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import os
2+
import platform
23

34
import pytest
45

@@ -11,6 +12,10 @@
1112

1213

1314
@requires_api_version('1.25')
15+
@pytest.mark.skipif(
16+
platform.machine().lower() not in ('amd64', 'x86_64'),
17+
reason='vieux/sshfs plugin is only supported on amd64',
18+
)
1419
class PluginTest(BaseAPIIntegrationTest):
1520
@classmethod
1621
def teardown_class(cls):

tests/integration/credentials/store_test.py

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import os
2+
import platform
23
import random
34
import shutil
45
import sys
@@ -14,6 +15,10 @@
1415
)
1516

1617

18+
@pytest.mark.skipif(
19+
platform.machine().lower() not in ('amd64', 'x86_64'),
20+
reason='docker-credential-pass test helper is only supported on amd64',
21+
)
1722
class TestStore:
1823
def teardown_method(self):
1924
for server in self.tmp_keys:

0 commit comments

Comments
 (0)