Mesa (master): ci: Remove LLVM from ARM test drivers.

[GitLab Mirror]

Module: Mesa
Branch: master
Commit: 257415863b8431214f9eefa47df910053007c053
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=257415863b8431214f9eefa47df910053007c053

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>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/3928>

---

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

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 30f050c1f61..4cfcd312a64 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -332,6 +332,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
@@ -342,6 +344,8 @@ meson-arm64:
     - .ci-deqp-artifacts
   variables:
     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 04441ee50d1..b11a774c021 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 \
@@ -17,7 +10,6 @@ apt-get -y install --no-install-recommends \
     libexpat1 \
     libdrm2 \
     libdrm-nouveau2 \
-    $LLVM
 passwd root -d
 chsh -s /bin/sh