gitlab-ci: Consolidate container and build stages for LAVA

Use the normal build job to also prepare the artifacts for LAVA jobs.

For that, the build container needs to also build the test suites,
kernel, ramdisk, etc.

Then the build job will place the just-built Mesa in the ramdisk and the
test job can generate a LAVA job and point to those artifacts.

Signed-off-by: Tomeu Vizoso <[email protected]>
Acked-by: Alyssa Rosenzweig <[email protected]>
Reviewed-by: Daniel Stone <[email protected]>
Tested-by: Marge Bot <https://gitlab.freedesktop.org/mesa/mesa/merge_requests/3295>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/merge_requests/3295>

1 files changed, 17 insertions, 7 deletions

diff --git a/.gitlab-ci/create-rootfs.sh b/.gitlab-ci/create-rootfs.sh
index e84f2271f42..810924061fb 100644
--- a/.gitlab-ci/create-rootfs.sh
+++ b/.gitlab-ci/create-rootfs.sh
@@ -1,8 +1,23 @@
-#!/bin/sh
+#!/bin/bash
 
 set -ex
 
-apt-get -y install --no-install-recommends initramfs-tools libpng16-16 strace libsensors5 libexpat1 libdrm2
+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 \
+    strace \
+    libsensors5 \
+    libexpat1 \
+    libdrm2 \
+    libdrm-nouveau2 \
+    $LLVM
 passwd root -d
 chsh -s /bin/sh
 ln -s /bin/sh /init
@@ -82,15 +97,10 @@ UNNEEDED_PACKAGES="apt libapt-pkg5.0 "\
 "libsemanage1 libsemanage-common "\
 "libsepol1 "\
 "gzip "\
-"gnupg "\
 "gpgv "\
 "hostname "\
 "adduser "\
 "debian-archive-keyring "\
-"libgl1 libgl1-mesa-dri libglapi-mesa libglvnd0 libglx-mesa0 libegl-mesa0 libgles2 "\
-"libllvm7 "\
-"libx11-data libthai-data "\
-"systemd dbus "\
 
 # Removing unneeded packages
 for PACKAGE in ${UNNEEDED_PACKAGES}