summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Vetter <daniel.vetter@ffwll.ch>2018-11-26 15:36:02 +0100
committerDaniel Vetter <daniel.vetter@ffwll.ch>2018-11-27 09:50:04 +0100
commit664cfca333b49b9d5252350efed42c5d1cc0bc48 (patch)
treef307b21158b5a5f2a79b2906a60e94c379cd9db2
parente5b829891a152f3081ba8f6d9c7d2ac98daebf76 (diff)
gitlab-CI: Enable arm64 test target
Our gitlab no supports binfmt-misc running of forgein binaries: https://gitlab.freedesktop.org/freedesktop/freedesktop/issues/91 Only thing missing is that we also need to install qemu-user-static, since binfmt-misc wants to run that binary from our namespace. Big kudos to Daniel for setting this up. Example run on my stuff branch: https://gitlab.freedesktop.org/danvet/igt-gpu-tools/-/jobs/50307 Cc: Daniel Stone <daniel@fooishbar.org> Reviewed-by: Sean Paul <sean@poorly.run> Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
-rw-r--r--.gitlab-ci.yml1
-rw-r--r--Dockerfile.debian-arm643
2 files changed, 2 insertions, 2 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b41df37e..d09eca30 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -87,7 +87,6 @@ test:ninja-test:
script: ninja -C build test
test:ninja-test-arm64:
- when: manual
image: $CI_REGISTRY/$CI_PROJECT_PATH/igt-debian-arm64:latest
dependencies:
- build:tests-debian-meson-arm64
diff --git a/Dockerfile.debian-arm64 b/Dockerfile.debian-arm64
index 20c2e8b3..e4905a22 100644
--- a/Dockerfile.debian-arm64
+++ b/Dockerfile.debian-arm64
@@ -35,7 +35,8 @@ RUN apt-get install -y \
RUN apt-get install -t stretch-backports -y \
meson \
libdrm-dev:arm64 \
- qemu-user
+ qemu-user \
+ qemu-user-static
# autotools build deps
RUN apt-get install -y \