summaryrefslogtreecommitdiff
path: root/.gitlab-ci
diff options
context:
space:
mode:
authorEric Anholt <eric@anholt.net>2021-01-21 15:59:47 -0800
committerMarge Bot <eric+marge@anholt.net>2021-02-01 18:32:01 +0000
commitd4855d29304ec9cc80bba1cd882cbb5ea6c3f5b0 (patch)
tree5760c26ed44e3b612e7163a4ac3ef44290d12fe3 /.gitlab-ci
parent2e2edaa89b4cfd935f1dde28e81bbcacf39ad15a (diff)
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>
Diffstat (limited to '.gitlab-ci')
-rw-r--r--.gitlab-ci/create-rootfs.sh2
-rw-r--r--.gitlab-ci/lava-gitlab-ci.yml2
2 files changed, 3 insertions, 1 deletions
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