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 4ce0dc37616ef083e16a6f8452ea3f9a03ea46ed..aaed8ec14592fa964ce210c2b3a8fc08b9af38d7 100644 (file)
--- a/.gitlab-ci/container/x86_test-gl.sh
+++ b/.gitlab-ci/container/x86_test-gl.sh
@@ -11,9 +11,11 @@ STABLE_EPHEMERAL=" \
       automake \
       ccache \
       cmake \
+      g++ \
       libgbm-dev \
       libgles2-mesa-dev \
       libpcre3-dev \
+      libpciaccess-dev \
       libpng-dev \
       libvulkan-dev \
       libwaffle-dev \
@@ -30,20 +32,10 @@ STABLE_EPHEMERAL=" \
       xz-utils \
       "
 
-TESTING_EPHEMERAL=" \
-      g++ \
-      libc6-dev \
-      "
-
-apt-get update
-
 apt-get install -y --no-remove \
+      libxcb-shm0 \
       $STABLE_EPHEMERAL
 
-# Install packages we need from Debian testing last, to avoid pulling in more
-apt-get install -y -t testing \
-      $TESTING_EPHEMERAL
-
 
 . .gitlab-ci/container/container_pre_build.sh
 
@@ -71,12 +63,15 @@ apt-get install -y -t testing \
 
 . .gitlab-ci/build-renderdoc.sh
 
+############### Build libdrm
+
+. .gitlab-ci/build-libdrm.sh
+
 ############### Uninstall the build software
 
 ccache --show-stats
 
 apt-get purge -y \
-      $STABLE_EPHEMERAL \
-      $TESTING_EPHEMERAL
+      $STABLE_EPHEMERAL
 
 apt-get autoremove -y --purge