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 6160e8b01f31195d7843ea0b841948782eb27386..aaed8ec14592fa964ce210c2b3a8fc08b9af38d7 100644 (file)
--- a/.gitlab-ci/container/x86_test-gl.sh
+++ b/.gitlab-ci/container/x86_test-gl.sh
@@ -5,53 +5,43 @@ set -o xtrace
 
 export DEBIAN_FRONTEND=noninteractive
 
-apt-get install -y ca-certificates
-
-sed -i -e 's/http:\/\/deb/https:\/\/deb/g' /etc/apt/sources.list
-echo 'deb https://deb.debian.org/debian buster-backports main' >/etc/apt/sources.list.d/backports.list
-
-apt-get update
-
-# Use newer packages from backports by default
-cat >/etc/apt/preferences <<EOF
-Package: *
-Pin: release a=buster-backports
-Pin-Priority: 500
-EOF
-
-apt-get dist-upgrade -y
-
-apt-get install -y --no-remove \
+# Ephemeral packages (installed for this script and removed again at the end)
+STABLE_EPHEMERAL=" \
+      autoconf \
+      automake \
+      ccache \
       cmake \
       g++ \
-      git \
-      gcc \
-      libexpat1 \
       libgbm-dev \
       libgles2-mesa-dev \
-      libpng16-16 \
+      libpcre3-dev \
+      libpciaccess-dev \
       libpng-dev \
-      libvulkan1 \
       libvulkan-dev \
       libwaffle-dev \
-      libwayland-server0 \
-      libxcb-xfixes0 \
-      libxkbcommon0 \
+      libxcb-keysyms1-dev \
       libxkbcommon-dev \
-      libxrender1 \
       libxrender-dev \
+      make \
       meson \
       patch \
       pkg-config \
-      python3-mako \
-      python3-numpy \
-      python3-six \
-      python \
-      waffle-utils \
-      xauth \
-      xvfb \
-      zlib1g
+      python3-distutils \
+      python3.7-dev \
+      wget \
+      xz-utils \
+      "
+
+apt-get install -y --no-remove \
+      libxcb-shm0 \
+      $STABLE_EPHEMERAL
+
+
+. .gitlab-ci/container/container_pre_build.sh
+
+############### Build virglrenderer
 
+. .gitlab-ci/build-virglrenderer.sh
 
 ############### Build piglit
 
@@ -65,24 +55,23 @@ apt-get install -y --no-remove \
 
 . .gitlab-ci/build-deqp-gl.sh
 
+############### Build apitrace
+
+. .gitlab-ci/build-apitrace.sh
+
+############### Build renderdoc
+
+. .gitlab-ci/build-renderdoc.sh
+
+############### Build libdrm
+
+. .gitlab-ci/build-libdrm.sh
 
 ############### Uninstall the build software
 
+ccache --show-stats
+
 apt-get purge -y \
-      cmake \
-      g++ \
-      gcc \
-      git \
-      libc6-dev \
-      libgbm-dev \
-      libgles2-mesa-dev \
-      libpng-dev \
-      libwaffle-dev \
-      libxkbcommon-dev \
-      libxrender-dev \
-      meson \
-      patch \
-      pkg-config \
-      python
+      $STABLE_EPHEMERAL
 
 apt-get autoremove -y --purge