diff options
| author | Adrian Reber <areber@redhat.com> | 2019-11-04 10:58:54 +0300 |
|---|---|---|
| committer | Andrei Vagin <avagin@gmail.com> | 2020-02-04 23:39:04 +0300 |
| commit | eab8cf0775ed5569bb22795a86817dae06cf0005 (patch) | |
| tree | b5965b1300db5fa9f3a71659cb29205a8d8a3861 /scripts/travis | |
| parent | 075f1beaf7d36cb9ea5030e1faab9661c33290ab (diff) | |
travis: switch all arm related tests to real hardware
This switches all arm related tests (32bit and 64bit) to the aarch64
systems Travis provides. For arm32 we are running in a armv7hf container
on aarch64 with 'setarch linux32'.
The main changes are that docker on Travis aarch64 cannot use
'--privileged' as Travis is using unprivileged LXD containers to setup
the testing environment.
Signed-off-by: Adrian Reber <areber@redhat.com>
Diffstat (limited to 'scripts/travis')
| -rw-r--r-- | scripts/travis/Makefile | 2 | ||||
| -rwxr-xr-x | scripts/travis/podman-test.sh | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/scripts/travis/Makefile b/scripts/travis/Makefile index 80c7b9230..373171149 100644 --- a/scripts/travis/Makefile +++ b/scripts/travis/Makefile @@ -28,6 +28,8 @@ endef export DOCKER_JSON ifeq ($(UNAME),x86_64) + # On anything besides x86_64 Travis is running unprivileged LXD + # containers which do not support running docker with '--privileged'. CONTAINER_OPTS := --rm -it --privileged -v /lib/modules:/lib/modules --tmpfs /run else CONTAINER_OPTS := --rm -v /lib/modules:/lib/modules --tmpfs /run diff --git a/scripts/travis/podman-test.sh b/scripts/travis/podman-test.sh index 9bd1f3d8b..eafdc73be 100755 --- a/scripts/travis/podman-test.sh +++ b/scripts/travis/podman-test.sh @@ -11,7 +11,7 @@ apt-get install -qq \ apt-get update -qq -apt-get install -qqy podman +apt-get install -qqy podman containernetworking-plugins export SKIP_TRAVIS_TEST=1 |