turnip: Fix unused variable warnings.

[mesa.git] / .gitlab-ci.yml

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 995bf5b278adf715c6aac2f39f18bdaf890aab26..c85f5dbe566691713306798cb261ac71b2517ebd 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -4,7 +4,7 @@ variables:
 include:
   - project: 'wayland/ci-templates'
     # Must be the same as in .gitlab-ci/lava-gitlab-ci.yml
-    ref: f69acac60d5dde0410124fd5674764600821b7a6
+    ref: 0a9bdd33a98f05af6761ab118b5074952242aab0
     file: '/templates/debian.yml'
 
 include:
@@ -103,7 +103,7 @@ x86_build:
 x86_test:
   extends: x86_build
   variables:
-    DEBIAN_TAG: &x86_test "2019-11-22"
+    DEBIAN_TAG: &x86_test "2019-12-02"
 
 # Debian 9 based x86 build image (old LLVM)
 x86_build_old:
@@ -474,8 +474,10 @@ scons-old-llvm:
 .piglit-test:
   extends: .test
   artifacts:
-    reports:
-      junit: results/results.xml
+    when: on_failure
+    name: "$CI_JOB_NAME-$CI_COMMIT_REF_NAME"
+    paths:
+      - summary/
   variables:
     LIBGL_ALWAYS_SOFTWARE: 1
     PIGLIT_NO_WINDOW: 1
@@ -487,6 +489,7 @@ piglit-quick_gl:
   variables:
     LP_NUM_THREADS: 0
     PIGLIT_OPTIONS: >
+      --process-isolation false
       -x arb_gpu_shader5
       -x glx-multithread-clearbuffer
       -x glx-multithread-shader-compile
@@ -494,7 +497,13 @@ piglit-quick_gl:
       -x maxsize
     PIGLIT_PROFILES: quick_gl
 
-piglit-glslparser+quick_shader:
+piglit-glslparser:
+  extends: .piglit-test
+  variables:
+    LP_NUM_THREADS: 0
+    PIGLIT_PROFILES: glslparser
+
+piglit-quick_shader:
   extends: .piglit-test
   variables:
     LP_NUM_THREADS: 1
@@ -505,8 +514,7 @@ piglit-glslparser+quick_shader:
       -x spec@arb_separate_shader_objects@linker
       -x spec@arb_shader_storage_buffer_object@execution
       -x spec@glsl-1.50@execution@built-in-functions
-    PIGLIT_PROFILES: "glslparser quick_shader"
-    PIGLIT_RESULTS: "glslparser+quick_shader"
+    PIGLIT_PROFILES: quick_shader
 
 .deqp-test:
   extends: .test