From d4855d29304ec9cc80bba1cd882cbb5ea6c3f5b0 Mon Sep 17 00:00:00 2001
From: Eric Anholt <eric@anholt.net>
Date: Thu, 21 Jan 2021 15:59:47 -0800
Subject: [PATCH] ci/lava+baremetal: Add an xserver to the root fs.

We want to be able to test GLX and EGL on real hardware, and we can't do
that with just the surfaceless backend.  Bringing up the xserver is pretty
easy.

Reviewed-by: Daniel Stone <daniel@fooishbar.org>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/8727>
---
 .gitlab-ci.yml                | 4 ++--
 .gitlab-ci/create-rootfs.sh   | 2 ++
 .gitlab-ci/lava-gitlab-ci.yml | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 73abfc7cbc2..f36eb7a774a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -408,7 +408,7 @@ arm64_test:
   extends:
     - .use-arm_test-base
   variables:
-    MESA_IMAGE_TAG: &arm64_test "2021-01-27-kernel"
+    MESA_IMAGE_TAG: &arm64_test "2021-01-29-xserver"
 
 .use-arm64_test:
   variables:
@@ -422,7 +422,7 @@ armhf_test:
   extends:
     - .use-arm_test-base
   variables:
-    MESA_IMAGE_TAG: &armhf_test "2021-01-27-kernel"
+    MESA_IMAGE_TAG: &armhf_test "2021-01-29-xserver"
 
 .use-armhf_test:
   variables:
diff --git a/.gitlab-ci/create-rootfs.sh b/.gitlab-ci/create-rootfs.sh
index 17c25d4e812..72cdae20810 100644
--- a/.gitlab-ci/create-rootfs.sh
+++ b/.gitlab-ci/create-rootfs.sh
@@ -76,6 +76,8 @@ apt-get -y install --no-install-recommends \
     sntp \
     strace \
     wget \
+    xinit \
+    xserver-xorg-core \
     xz-utils
 
 if [ -n "$INCLUDE_PIGLIT" ]; then
diff --git a/.gitlab-ci/lava-gitlab-ci.yml b/.gitlab-ci/lava-gitlab-ci.yml
index 82489491b73..09705623928 100644
--- a/.gitlab-ci/lava-gitlab-ci.yml
+++ b/.gitlab-ci/lava-gitlab-ci.yml
@@ -1,5 +1,5 @@
 variables:
-  DISTRIBUTION_TAG: "2020-01-13-piglit"
+  DISTRIBUTION_TAG: "2021-01-26-xserver"
 
 .kernel+rootfs:
   stage: container-2