Skip to content

Commit a7e23be

Browse files
dianpopaandreeaflorescu
authored andcommitted
CI: do not test vsock on aarch64
Signed-off-by: Diana Popa <[email protected]>
1 parent 96f620c commit a7e23be

File tree

2 files changed

+14
-2
lines changed

2 files changed

+14
-2
lines changed

tests/conftest.py

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,6 +121,12 @@ def test_with_any_microvm(test_microvm_any):
121121

122122
IP4_GENERATOR_CREATE_LOCK = threading.Lock()
123123

124+
MICROVM_FIXTURE_PARAMS = ['', 'vsock']
125+
# Since this is a temporary feature, we do not test
126+
# it on aarch64.
127+
if platform.machine() == "aarch64":
128+
MICROVM_FIXTURE_PARAMS = ['']
129+
124130

125131
# This codebase uses Python features available in Python 3.6 or above
126132
if sys.version_info < (3, 6):
@@ -288,7 +294,7 @@ def aux_bin_paths(test_session_root_path):
288294
}
289295

290296

291-
@pytest.fixture(params=['', 'vsock'])
297+
@pytest.fixture(params=MICROVM_FIXTURE_PARAMS)
292298
def microvm(request, test_session_root_path, aux_bin_paths):
293299
"""Instantiate a microvm."""
294300
# pylint: disable=redefined-outer-name

tests/integration_tests/build/test_build.py

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,16 @@
1010

1111
import host_tools.cargo_build as host # pylint:disable=import-error
1212

13+
MACHINE = platform.machine()
1314
FEATURES = ["", "vsock"]
15+
16+
# Since this is a temporary feature, we do not test
17+
# it on aarch64.
18+
if MACHINE == "aarch64":
19+
FEATURES = [""]
20+
1421
BUILD_TYPES = ["debug", "release"]
1522

16-
MACHINE = platform.machine()
1723
TARGETS = ["{}-unknown-linux-gnu".format(MACHINE),
1824
"{}-unknown-linux-musl".format(MACHINE)]
1925

0 commit comments

Comments
 (0)