diff options
| author | Michel Dänzer <mdaenzer@redhat.com> | 2019-11-04 09:54:09 +0100 |
|---|---|---|
| committer | Michel Dänzer <michel@daenzer.net> | 2019-11-06 13:10:07 +0100 |
| commit | b4d3ae22697ec97c4ffb017aac8eeed4aad7fb74 (patch) | |
| tree | 34769868256f185a1c22e07a0d0da1d35731cf7b /.gitlab-ci.yml | |
| parent | dd4587b55cdfb09d5e0ebf6b7e7216b46ae10c3e (diff) | |
gitlab-ci: Use separate arm64 build/test docker images
The image used for test jobs is only about 1/6 as big as before, which
may help avoid some issues with some of the test boards.
Inspired by https://gitlab.freedesktop.org/mesa/mesa/issues/2046 .
v2:
* Leave LIBDRM_VERSION at 2.4.99 (Daniel Stone)
* Delete more build artifacts from dEQP tree (Daniel Stone)
v3:
* Set LD_LIBRARY_PATH for ldd
Acked-by: Daniel Stone <daniels@collabora.com> # v2
Reviewed-by: Eric Anholt <eric@anholt.net> # Except for the ldd line
Diffstat (limited to '.gitlab-ci.yml')
| -rw-r--r-- | .gitlab-ci.yml | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 0c1a59ba334..3c9b41d0414 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -15,12 +15,14 @@ variables: UPSTREAM_REPO: mesa/mesa DEBIAN_TAG: "2019-10-30" - DEBIAN_ARM64_TAG: "arm64v8-2019-10-23" + DEBIAN_ARM64_TAG: "arm64v8-2019-11-06" + DEBIAN_ARM64_TEST_TAG: "arm64v8-test-2019-11-06" STRETCH_TAG: "2019-09-18" DEBIAN_VERSION: buster-slim STRETCH_VERSION: stretch-slim DEBIAN_IMAGE: "$CI_REGISTRY_IMAGE/debian/$DEBIAN_VERSION:$DEBIAN_TAG" DEBIAN_ARM64_IMAGE: "$CI_REGISTRY_IMAGE/debian/$DEBIAN_VERSION:$DEBIAN_ARM64_TAG" + DEBIAN_ARM64_TEST_IMAGE: "$CI_REGISTRY_IMAGE/debian/$DEBIAN_VERSION:$DEBIAN_ARM64_TEST_TAG" STRETCH_IMAGE: "$CI_REGISTRY_IMAGE/debian/$STRETCH_VERSION:$STRETCH_TAG" include: @@ -118,6 +120,14 @@ debian-10:arm64: DEBIAN_TAG: "$DEBIAN_ARM64_TAG" DEBIAN_EXEC: 'bash .gitlab-ci/debian-arm64-install.sh' +debian-10-test:arm64: + extends: + - .debian@container-ifnot-exists@arm64v8 + - .container + variables: + DEBIAN_TAG: "$DEBIAN_ARM64_TEST_TAG" + DEBIAN_EXEC: 'bash .gitlab-ci/debian-arm64-test-install.sh' + # BUILD @@ -463,6 +473,7 @@ scons-old-llvm: # Note: Build dir (and thus install) may be dirty due to GIT_STRATEGY - rm -rf install - tar -xf artifacts/install.tar + - LD_LIBRARY_PATH=install/lib ldd install/lib/{*,dri/swrast_dri}.so - ./artifacts/deqp-runner.sh artifacts: when: on_failure @@ -507,7 +518,7 @@ test-softpipe-gles3-limited: arm64_a630_gles2: extends: .deqp-test - image: $DEBIAN_ARM64_IMAGE + image: $DEBIAN_ARM64_TEST_IMAGE variables: DEQP_VER: gles2 DEQP_RENDERER_MATCH: "FD630" @@ -520,7 +531,7 @@ arm64_a630_gles2: - meson-arm64 needs: - meson-arm64 - - debian-10:arm64 + - debian-10-test:arm64 arm64_a630_gles31: extends: arm64_a630_gles2 |