X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=.gitlab-ci.yml;h=8de20ed8ef512463fbc72800ca67b620b0e29364;hb=93b8d8927579baf89bb6de58f4d3c8b11b142802;hp=7cb88ddbe845f9ffdccdb78618c0469823b4e676;hpb=ad3ef6d0fc01fead5b72c6376387ecf5c48bfef4;p=mesa.git

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7cb88ddbe84..8de20ed8ef5 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -133,7 +133,7 @@ x86_build:
     - .fdo.container-build@debian
     - .container
   variables:
-    FDO_DISTRIBUTION_TAG: &x86_build "2020-03-18-jflags"
+    FDO_DISTRIBUTION_TAG: &x86_build "2020-04-22-winehq"
 
 .use-x86_build:
   variables:
@@ -146,7 +146,7 @@ x86_build:
 x86_test-gl:
   extends: x86_build
   variables:
-    FDO_DISTRIBUTION_TAG: &x86_test-gl "2020-04-20"
+    FDO_DISTRIBUTION_TAG: &x86_test-gl "2020-04-21"
 
 # Debian 10 based x86 test image for VK
 x86_test-vk:
@@ -548,7 +548,8 @@ meson-s390x:
   script:
     # For unknown reasons "too many" installed i386 libraries cause qemu to
     # crash while executing llvm-config for s390x.
-    - apt-get remove -y libglib2.0-0:i386
+    - apt-get purge -y winehq-stable
+    - apt-get autoremove -y --purge
     - dpkg -i /var/cache/apt/archives/$CROSS/*.deb
     - .gitlab-ci/meson-build.sh
 
@@ -739,6 +740,17 @@ virgl-gles3:
     DEQP_RUNNER_OPTIONS: "--compact-display false --timeout 120"
   extends: virgl-gles2
 
+virgl-gles31:
+  variables:
+    DEQP_VER: gles31
+    CI_NODE_INDEX: 1
+    CI_NODE_TOTAL: 10
+    DEQP_OPTIONS: "--deqp-log-images=disable"
+    DEQP_RUNNER_OPTIONS: "--compact-display false --timeout 120"
+    MESA_GLES_VERSION_OVERRIDE: "3.1"
+    MESA_GLSL_VERSION_OVERRIDE: "310"
+  extends: virgl-gles2
+
 # Rules for tests that should not be present in MRs or the main
 # project's pipeline (don't block marge or report red on
 # mesa/mesamaster) but should be present on pipelines in personal
@@ -920,3 +932,14 @@ radv-polaris10-traces:
     DEVICE_NAME: "vk-amd-polaris10"
   tags:
     - polaris10
+
+virgl-traces:
+  extends:
+    - .traces-test-gl
+    - .virgl-rules
+  variables:
+    LIBGL_ALWAYS_SOFTWARE: "true"
+    GALLIUM_DRIVER: "virpipe"
+    DEVICE_NAME: "gl-virgl"
+    MESA_GLES_VERSION_OVERRIDE: "3.1"
+    MESA_GLSL_VERSION_OVERRIDE: "310"