gitlab-ci: add a gl suffix to the x86 test image and all test jobs

Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Reviewed-by: Michel Dänzer <mdaenzer@redhat.com>

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 9934293b2df4093d5f1129e7d6c824300b180b4c..9aea544a87bdf40debb09a83fdb9c960160fd449 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -105,11 +105,11 @@ x86_build:
   needs:
     - x86_build
 
-# Debian 10 based x86 test image
-x86_test:
+# Debian 10 based x86 test image for GL
+x86_test-gl:
   extends: x86_build
   variables:
-    DEBIAN_TAG: &x86_test "2019-12-02"
+    DEBIAN_TAG: &x86_test-gl "2019-12-05"
 
 # Debian 9 based x86 build image (old LLVM)
 x86_build_old:
@@ -453,14 +453,14 @@ scons-old-llvm:
   script:
     - LLVM_VERSION=3.9 .gitlab-ci/scons-build.sh
 
-.test:
+.test-gl:
   extends:
     - .ci-run-policy
   stage: test
   variables:
     GIT_STRATEGY: none # testing doesn't build anything from source
-    TAG: *x86_test
-  image: "$CI_REGISTRY_IMAGE/debian/x86_test:$TAG"
+    TAG: *x86_test-gl
+  image: "$CI_REGISTRY_IMAGE/debian/x86_test-gl:$TAG"
   before_script:
     # Note: Build dir (and thus install) may be dirty due to GIT_STRATEGY
     - rm -rf install
@@ -475,10 +475,10 @@ scons-old-llvm:
     - meson-testing
   needs:
     - meson-testing
-    - x86_test
+    - x86_test-gl
 
 .piglit-test:
-  extends: .test
+  extends: .test-gl
   artifacts:
     when: on_failure
     name: "$CI_JOB_NAME-$CI_COMMIT_REF_NAME"
@@ -524,8 +524,8 @@ piglit-quick_shader:
       -x spec@glsl-1.50@execution@built-in-functions
     PIGLIT_PROFILES: quick_shader
 
-.deqp-test:
-  extends: .test
+.deqp-test-gl:
+  extends: .test-gl
   variables:
     DEQP_SKIPS: deqp-default-skips.txt
   script:
@@ -540,7 +540,7 @@ test-llvmpipe-gles2:
     LP_NUM_THREADS: 0
     DEQP_EXPECTED_FAILS: deqp-llvmpipe-fails.txt
     LIBGL_ALWAYS_SOFTWARE: "true"
-  extends: .deqp-test
+  extends: .deqp-test-gl
 
 test-softpipe-gles2:
   extends: test-llvmpipe-gles2
@@ -563,7 +563,7 @@ test-softpipe-gles31:
 
 arm64_a630_gles2:
   extends:
-    - .deqp-test
+    - .deqp-test-gl
     - .use-arm_test
   variables:
     DEQP_VER: gles2

diff --git a/.gitlab-ci/container/x86_test-gl.sh b/.gitlab-ci/container/x86_test-gl.sh
new file mode 100644 (file)
index 0000000..6160e8b
--- /dev/null
+++ b/.gitlab-ci/container/x86_test-gl.sh
@@ -0,0 +1,88 @@
+#!/bin/bash
+
+set -e
+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 \
+      cmake \
+      g++ \
+      git \
+      gcc \
+      libexpat1 \
+      libgbm-dev \
+      libgles2-mesa-dev \
+      libpng16-16 \
+      libpng-dev \
+      libvulkan1 \
+      libvulkan-dev \
+      libwaffle-dev \
+      libwayland-server0 \
+      libxcb-xfixes0 \
+      libxkbcommon0 \
+      libxkbcommon-dev \
+      libxrender1 \
+      libxrender-dev \
+      meson \
+      patch \
+      pkg-config \
+      python3-mako \
+      python3-numpy \
+      python3-six \
+      python \
+      waffle-utils \
+      xauth \
+      xvfb \
+      zlib1g
+
+
+############### Build piglit
+
+. .gitlab-ci/build-piglit.sh
+
+############### Build dEQP runner
+
+. .gitlab-ci/build-cts-runner.sh
+
+############### Build dEQP GL
+
+. .gitlab-ci/build-deqp-gl.sh
+
+
+############### Uninstall the build software
+
+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
+
+apt-get autoremove -y --purge

diff --git a/.gitlab-ci/container/x86_test.sh b/.gitlab-ci/container/x86_test.sh
deleted file mode 100644 (file)
index 6160e8b..0000000
--- a/.gitlab-ci/container/x86_test.sh
+++ /dev/null
@@ -1,88 +0,0 @@
-#!/bin/bash
-
-set -e
-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 \
-      cmake \
-      g++ \
-      git \
-      gcc \
-      libexpat1 \
-      libgbm-dev \
-      libgles2-mesa-dev \
-      libpng16-16 \
-      libpng-dev \
-      libvulkan1 \
-      libvulkan-dev \
-      libwaffle-dev \
-      libwayland-server0 \
-      libxcb-xfixes0 \
-      libxkbcommon0 \
-      libxkbcommon-dev \
-      libxrender1 \
-      libxrender-dev \
-      meson \
-      patch \
-      pkg-config \
-      python3-mako \
-      python3-numpy \
-      python3-six \
-      python \
-      waffle-utils \
-      xauth \
-      xvfb \
-      zlib1g
-
-
-############### Build piglit
-
-. .gitlab-ci/build-piglit.sh
-
-############### Build dEQP runner
-
-. .gitlab-ci/build-cts-runner.sh
-
-############### Build dEQP GL
-
-. .gitlab-ci/build-deqp-gl.sh
-
-
-############### Uninstall the build software
-
-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
-
-apt-get autoremove -y --purge