Mesa (staging/20.0): ci: Remove LLVM from ARM test drivers.

[GitLab Mirror]

Module: Mesa
Branch: staging/20.0
Commit: 9d50c53e474cede8d42641fa588132a539204e1d
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=9d50c53e474cede8d42641fa588132a539204e1d

Author: Eric Anholt <eric at anholt.net>
Date:   Mon Feb 24 10:31:33 2020 -0800

ci: Remove LLVM from ARM test drivers.

The LLVM libraries were a significant fraction of the entire payload
(55M/250M uncompressed) into the initramfs of the test boards, but
LLVM is only used for the draw module used in select/feedback (which
isn't even tested in CI on ARM yet).

Assume that llvmpipe draw is safe enough for ARM given the coverage on
x86, and disable LLVM for these jobs.

Reviewed-by: Tomeu Vizoso <tomeu.vizoso at collabora.com>
(cherry picked from commit 257415863b8431214f9eefa47df910053007c053)

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4462>

---

 .gitlab-ci.yml              |  4 ++++
 .gitlab-ci/create-rootfs.sh | 10 +---------
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 4cb1e341154..88b0bc197c6 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -334,6 +334,8 @@ meson-armhf:
   variables:
     CROSS: armhf
     LLVM_VERSION: "7"
+    EXTRA_OPTION: >
+      -D llvm=false
   script:
     - .gitlab-ci/meson-build.sh
     - .gitlab-ci/prepare-artifacts.sh
@@ -345,6 +347,8 @@ meson-arm64:
   variables:
     LLVM_VERSION: "8"
     VULKAN_DRIVERS: "freedreno"
+    EXTRA_OPTION: >
+      -D llvm=false
   script:
     - .gitlab-ci/meson-build.sh
     - .gitlab-ci/prepare-artifacts.sh
diff --git a/.gitlab-ci/create-rootfs.sh b/.gitlab-ci/create-rootfs.sh
index 810924061fb..43bc0564514 100644
--- a/.gitlab-ci/create-rootfs.sh
+++ b/.gitlab-ci/create-rootfs.sh
@@ -2,13 +2,6 @@
 
 set -ex
 
-LLVM=libllvm8
-
-# LLVMPipe on armhf is broken with LLVM 8
-if [ `dpkg --print-architecture` = "armhf" ]; then
-        LLVM=libllvm7
-fi
-
 apt-get -y install --no-install-recommends \
     initramfs-tools \
     libpng16-16 \
@@ -16,8 +9,7 @@ apt-get -y install --no-install-recommends \
     libsensors5 \
     libexpat1 \
     libdrm2 \
-    libdrm-nouveau2 \
-    $LLVM
+    libdrm-nouveau2
 passwd root -d
 chsh -s /bin/sh
 ln -s /bin/sh /init