Skip to content

Commit

Permalink
CI: do not test vsock on aarch64
Browse files Browse the repository at this point in the history
Signed-off-by: Diana Popa <[email protected]>
  • Loading branch information
dianpopa authored and andreeaflorescu committed Jun 11, 2019
1 parent 96f620c commit a7e23be
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 2 deletions.
8 changes: 7 additions & 1 deletion tests/conftest.py
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,12 @@ def test_with_any_microvm(test_microvm_any):

IP4_GENERATOR_CREATE_LOCK = threading.Lock()

MICROVM_FIXTURE_PARAMS = ['', 'vsock']
# Since this is a temporary feature, we do not test
# it on aarch64.
if platform.machine() == "aarch64":
MICROVM_FIXTURE_PARAMS = ['']


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


@pytest.fixture(params=['', 'vsock'])
@pytest.fixture(params=MICROVM_FIXTURE_PARAMS)
def microvm(request, test_session_root_path, aux_bin_paths):
"""Instantiate a microvm."""
# pylint: disable=redefined-outer-name
Expand Down
8 changes: 7 additions & 1 deletion tests/integration_tests/build/test_build.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,16 @@

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

MACHINE = platform.machine()
FEATURES = ["", "vsock"]

# Since this is a temporary feature, we do not test
# it on aarch64.
if MACHINE == "aarch64":
FEATURES = [""]

BUILD_TYPES = ["debug", "release"]

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

Expand Down

0 comments on commit a7e23be

Please sign in to comment.