X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=.gitlab-ci.yml;h=52da56863ca4233ae40504312a7e7ecf7a338450;hb=bfd9f3201e49cd3f46393b7737cd156a69e9f5ab;hp=b3888d55baa46b7677ace19730b79167e4ae0ac7;hpb=530d3b29007f3bf5e8c91a6c34fdc666b9aa726f;p=mesa.git

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b3888d55baa..52da56863ca 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -103,7 +103,7 @@ x86_build:
 x86_test:
   extends: x86_build
   variables:
-    DEBIAN_TAG: &x86_test "2019-11-20-2"
+    DEBIAN_TAG: &x86_test "2019-11-22"
 
 # Debian 9 based x86 build image (old LLVM)
 x86_build_old:
@@ -138,7 +138,7 @@ arm_build:
 arm_test:
   extends: arm_build
   variables:
-    DEBIAN_TAG: &arm_test "2019-11-12"
+    DEBIAN_TAG: &arm_test "2019-11-22"
 
 .use-arm_test:
   variables:
@@ -166,22 +166,16 @@ arm_test:
 # Just Linux
 .build-linux:
   extends: .build-common
-  cache:
-    key: ${CI_JOB_NAME}
-    paths:
-      - ccache
   variables:
     CCACHE_COMPILERCHECK: "content"
+    CCACHE_COMPRESS: "true"
+    CCACHE_DIR: /cache/mesa/ccache
   # Use ccache transparently, and print stats before/after
   before_script:
     - export PATH="/usr/lib/ccache:$PATH"
     - export CCACHE_BASEDIR="$PWD"
-    - export CCACHE_DIR="$PWD/ccache"
-    - ccache --max-size=1500M
-    - ccache --zero-stats || true
-    - ccache --show-stats || true
+    - ccache --show-stats
   after_script:
-    - export CCACHE_DIR="$PWD/ccache"
     - ccache --show-stats
 
 .build-windows:
@@ -209,10 +203,28 @@ arm_test:
   script:
     - .gitlab-ci/scons-build.sh
 
-meson-main:
+meson-testing:
   extends:
     - .meson-build
     - .ci-deqp-artifacts
+  variables:
+    UNWIND: "true"
+    DRI_LOADERS: >
+      -D glx=dri
+      -D gbm=true
+      -D egl=true
+      -D platforms=x11,drm,surfaceless
+    GALLIUM_ST: >
+      -D dri3=true
+    GALLIUM_DRIVERS: "swrast"
+    LLVM_VERSION: "7"
+    BUILDTYPE: "debugoptimized"
+  script:
+    - .gitlab-ci/meson-build.sh
+    - .gitlab-ci/prepare-artifacts.sh
+
+meson-main:
+  extends: .meson-build
   variables:
     UNWIND: "true"
     DRI_LOADERS: >
@@ -231,16 +243,14 @@ meson-main:
       -D gallium-xa=true
       -D gallium-nine=true
       -D gallium-opencl=disabled
-    GALLIUM_DRIVERS: "iris,nouveau,kmsro,r300,r600,freedreno,swrast,svga,v3d,vc4,virgl,etnaviv,panfrost,lima,zink"
+    GALLIUM_DRIVERS: "iris,nouveau,kmsro,r300,r600,freedreno,swr,swrast,svga,v3d,vc4,virgl,etnaviv,panfrost,lima,zink"
     LLVM_VERSION: "7"
     EXTRA_OPTION: >
       -D osmesa=gallium
       -D tools=all
-    BUILDTYPE: "debugoptimized"
   script:
     - .gitlab-ci/meson-build.sh
     - .gitlab-ci/run-shader-db.sh
-    - .gitlab-ci/prepare-artifacts.sh
 
 .meson-cross:
   extends:
@@ -291,35 +301,12 @@ meson-arm64:
     - .gitlab-ci/meson-build.sh
     - .gitlab-ci/prepare-artifacts.sh
 
-# NOTE: Building SWR is 2x (yes two) times slower than all the other
-# gallium drivers combined.
-# Start this early so that it doesn't limit the total run time.
-#
-# We also stick the glvnd build here, since we want non-glvnd in
-# meson-main for actual driver CI.
-meson-swr-glvnd:
+meson-clang:
   extends: .meson-build
   variables:
     UNWIND: "true"
     DRI_LOADERS: >
       -D glvnd=true
-      -D egl=true
-    GALLIUM_ST: >
-      -D dri3=true
-      -D gallium-vdpau=false
-      -D gallium-xvmc=false
-      -D gallium-omx=disabled
-      -D gallium-va=false
-      -D gallium-xa=false
-      -D gallium-nine=false
-      -D gallium-opencl=disabled
-    GALLIUM_DRIVERS: "swr,iris"
-    LLVM_VERSION: "6.0"
-
-meson-clang:
-  extends: .meson-build
-  variables:
-    UNWIND: "true"
     DRI_DRIVERS: "auto"
     GALLIUM_DRIVERS: "auto"
     VULKAN_DRIVERS: intel,amd,freedreno
@@ -451,8 +438,6 @@ scons:
     SCONS_CHECK_COMMAND: "scons llvm=1 force_scons=1 check"
   script:
     - SCONS_TARGET="" SCONS_CHECK_COMMAND="scons check force_scons=1" .gitlab-ci/scons-build.sh
-    - LLVM_VERSION=6.0 .gitlab-ci/scons-build.sh
-    - LLVM_VERSION=7 .gitlab-ci/scons-build.sh
     - LLVM_VERSION=8 .gitlab-ci/scons-build.sh
 
 scons-old-llvm:
@@ -461,8 +446,6 @@ scons-old-llvm:
     - .use-x86_build_old
   script:
     - LLVM_VERSION=3.9 .gitlab-ci/scons-build.sh
-    - LLVM_VERSION=4.0 .gitlab-ci/scons-build.sh
-    - LLVM_VERSION=5.0 .gitlab-ci/scons-build.sh
 
 .test:
   extends:
@@ -476,16 +459,16 @@ scons-old-llvm:
     # Note: Build dir (and thus install) may be dirty due to GIT_STRATEGY
     - rm -rf install
     - tar -xf artifacts/install.tar
-    - LD_LIBRARY_PATH=install/lib ldd install/lib/{*,dri/swrast_dri}.so
+    - LD_LIBRARY_PATH=install/lib find install/lib -name "*.so" -print -exec ldd {} \;
   artifacts:
-    when: on_failure
+    when: always
     name: "$CI_JOB_NAME-$CI_COMMIT_REF_NAME"
     paths:
       - results/
   dependencies:
-    - meson-main
+    - meson-testing
   needs:
-    - meson-main
+    - meson-testing
     - x86_test
 
 .piglit-test:
@@ -531,6 +514,9 @@ piglit-glslparser+quick_shader:
     DEQP_SKIPS: deqp-default-skips.txt
   script:
     - ./artifacts/deqp-runner.sh
+  artifacts:
+    reports:
+      junit: results/results.xml
 
 test-llvmpipe-gles2:
   variables:
@@ -571,6 +557,8 @@ arm64_a630_gles2:
     DEQP_EXPECTED_FAILS: deqp-freedreno-a630-fails.txt
     DEQP_SKIPS: deqp-freedreno-a630-skips.txt
     NIR_VALIDATE: 0
+    DEQP_PARALLEL: 4
+    FLAKES_CHANNEL: "#freedreno-ci"
   tags:
     - mesa-cheza
   dependencies:
@@ -578,18 +566,15 @@ arm64_a630_gles2:
 
 arm64_a630_gles31:
   extends: arm64_a630_gles2
-  parallel: 4
   variables:
     DEQP_VER: gles31
 
 arm64_a630_gles3:
-  parallel: 6
   extends: arm64_a630_gles2
   variables:
     DEQP_VER: gles3
 
 arm64_a306_gles2:
-  parallel: 4
   extends: arm64_a630_gles2
   variables:
     DEQP_EXPECTED_FAILS: deqp-freedreno-a307-fails.txt