Revert "gitlab-ci: reuse container_post_build when building the test images"

[mesa.git] / .gitlab-ci / container / x86_test-gl.sh

diff --git a/.gitlab-ci/container/x86_test-gl.sh b/.gitlab-ci/container/x86_test-gl.sh
index 38e6e1e57e779d71625f659625fcca3af9d54967..aaed8ec14592fa964ce210c2b3a8fc08b9af38d7 100644 (file)
--- a/.gitlab-ci/container/x86_test-gl.sh
+++ b/.gitlab-ci/container/x86_test-gl.sh
@@ -15,6 +15,7 @@ STABLE_EPHEMERAL=" \
       libgbm-dev \
       libgles2-mesa-dev \
       libpcre3-dev \
+      libpciaccess-dev \
       libpng-dev \
       libvulkan-dev \
       libwaffle-dev \
@@ -22,14 +23,17 @@ STABLE_EPHEMERAL=" \
       libxkbcommon-dev \
       libxrender-dev \
       make \
+      meson \
       patch \
       pkg-config \
+      python3-distutils \
       python3.7-dev \
       wget \
       xz-utils \
       "
 
 apt-get install -y --no-remove \
+      libxcb-shm0 \
       $STABLE_EPHEMERAL
 
 
@@ -59,6 +63,10 @@ apt-get install -y --no-remove \
 
 . .gitlab-ci/build-renderdoc.sh
 
+############### Build libdrm
+
+. .gitlab-ci/build-libdrm.sh
+
 ############### Uninstall the build software
 
 ccache --show-stats