X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=.gitlab-ci.yml;h=92e006b324d7e3f5f4470ee5d47f06d841547dc1;hb=428360662f300c44729dada9cd57c5b9a04befe8;hp=7f6164c30886406a46a51636abca07de20acb2c6;hpb=4417e924bf710f7628e9e10727f025307eb3ce09;p=mesa.git

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7f6164c3088..92e006b324d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -244,7 +244,7 @@ x86_test-base:
 x86_test-gl:
   extends: .use-x86_test-base
   variables:
-    FDO_DISTRIBUTION_TAG: &x86_test-gl "2020-06-04"
+    FDO_DISTRIBUTION_TAG: &x86_test-gl "2020-06-23-virgl"
 
 # Debian 10 based x86 test image for VK
 x86_test-vk:
@@ -272,7 +272,7 @@ arm_build:
     - .fdo.container-build@debian@arm64v8
     - .container
   variables:
-    FDO_DISTRIBUTION_TAG: &arm_build "2020-06-12"
+    FDO_DISTRIBUTION_TAG: &arm_build "2020-06-22-tracie"
 
 .use-arm_build:
   variables:
@@ -287,7 +287,7 @@ arm_test-base:
     - .fdo.container-build@debian
     - .container
   variables:
-    FDO_DISTRIBUTION_TAG: &arm_test-base "2020-06-09-rsync"
+    FDO_DISTRIBUTION_TAG: &arm_test-base "2020-06-22-tracie"
 
 .use-arm_test-base:
   extends:
@@ -305,7 +305,7 @@ arm64_test:
   extends:
     - .use-arm_test-base
   variables:
-    FDO_DISTRIBUTION_TAG: &arm64_test "2020-06-18-vkcts"
+    FDO_DISTRIBUTION_TAG: &arm64_test "2020-06-22-tracie"
 
 .use-arm64_test:
   variables:
@@ -802,6 +802,11 @@ piglit-quick_shader:
   extends: .test-vk
   script:
     - ./install/fossilize-runner.sh
+  artifacts:
+    when: on_failure
+    name: "mesa_${CI_JOB_NAME}"
+    paths:
+      - results/
 
 llvmpipe-gles2:
   variables:
@@ -840,7 +845,7 @@ softpipe-gles31:
     DEQP_VER: gles31
   extends: softpipe-gles2
 
-virgl-gles2:
+virgl-gles2-on-gl:
   variables:
     DEQP_VER: gles2
     DEQP_PARALLEL: 4
@@ -849,7 +854,8 @@ virgl-gles2:
     # Don't use threads inside llvmpipe, we've already got all 4 cores
     # busy with DEQP_PARALLEL.
     LP_NUM_THREADS: 0
-    DEQP_EXPECTED_FAILS: deqp-virgl-fails.txt
+    DEQP_EXPECTED_FAILS: deqp-virgl-gl-fails.txt
+    DEQP_OPTIONS: "--deqp-log-images=disable"
     LIBGL_ALWAYS_SOFTWARE: "true"
     GALLIUM_DRIVER: "virpipe"
     DEQP_EXPECTED_RENDERER: virgl
@@ -857,23 +863,36 @@ virgl-gles2:
     - .deqp-test-gl
     - .virgl-rules
 
-virgl-gles3:
+virgl-gles3-on-gl:
   parallel: 2
   variables:
     DEQP_VER: gles3
-    DEQP_RUNNER_OPTIONS: "--timeout 120"
-  extends: virgl-gles2
+    DEQP_RUNNER_OPTIONS: "--timeout 180"
+  extends: virgl-gles2-on-gl
 
-virgl-gles31:
+virgl-gles31-on-gl:
   parallel: 4
   variables:
     DEQP_VER: gles31
-    DEQP_OPTIONS: "--deqp-log-images=disable"
-    DEQP_RUNNER_OPTIONS: "--timeout 120"
     MESA_GLES_VERSION_OVERRIDE: "3.1"
     MESA_GLSL_VERSION_OVERRIDE: "310"
     MESA_EXTENSION_OVERRIDE: "-GL_OES_tessellation_shader"
-  extends: virgl-gles2
+  extends: virgl-gles3-on-gl
+
+virgl-gl30-on-gl:
+  variables:
+    DEQP_VER: gl30
+  extends: virgl-gles2-on-gl
+
+virgl-gl31-on-gl:
+  variables:
+    DEQP_VER: gl31
+  extends: virgl-gles2-on-gl
+
+virgl-gl32-on-gl:
+  variables:
+    DEQP_VER: gl32
+  extends: virgl-gles2-on-gl
 
 # Rules for tests that should not be present in MRs or the main
 # project's pipeline (don't block marge or report red on
@@ -888,6 +907,30 @@ virgl-gles31:
       when: manual
     - when: never
 
+virgl-gles2-on-gles:
+  variables:
+    VIRGL_HOST_API: GLES
+    DEQP_EXPECTED_FAILS: deqp-virgl-gles-fails.txt
+  extends:
+    - virgl-gles2-on-gl
+    - .test-manual
+
+virgl-gles3-on-gles:
+  variables:
+    VIRGL_HOST_API: GLES
+    DEQP_EXPECTED_FAILS: deqp-virgl-gles-fails.txt
+  extends:
+    - virgl-gles3-on-gl
+    - .test-manual
+
+virgl-gles31-on-gles:
+  variables:
+    VIRGL_HOST_API: GLES
+    DEQP_EXPECTED_FAILS: deqp-virgl-gles-fails.txt
+  extends:
+    - virgl-gles31-on-gl
+    - .test-manual
+
 arm64_a630_gles2:
   extends:
     - arm64_a306_gles2
@@ -938,6 +981,18 @@ arm64_a630_bypass:
     FD_MESA_DEBUG: nogmem
     DEQP_EXPECTED_FAILS: deqp-freedreno-a630-bypass-fails.txt
 
+arm64_a630_traces:
+  extends:
+    - arm64_a630_gles2
+  variables:
+    BARE_METAL_TEST_SCRIPT: "/install/tracie-runner-gl.sh"
+    DEVICE_NAME: "freedreno-a630"
+    TRACIE_NO_UNIT_TESTS: 1
+    # This lets us run several more traces which don't use any features we're
+    # missing.
+    MESA_GLSL_VERSION_OVERRIDE: "460"
+    MESA_GL_VERSION_OVERRIDE: "4.6"
+
 # Along with checking gmem path, check that we don't get obvious nir
 # validation failures (though it's too expensive to have it on for the
 # full CTS)
@@ -1077,7 +1132,6 @@ arm64_a530_gles31:
   stage: radv
   variables:
     VK_DRIVER: radeon
-    RADV_DEBUG: checkir
     ACO_DEBUG: validateir,validatera
 
 # Can only be triggered manually on personal branches because RADV is the only
@@ -1100,23 +1154,18 @@ radv-fossils:
     # Pitcairn (GFX6)
     - export RADV_FORCE_FAMILY="pitcairn"
     - ./install/fossilize-runner.sh
-    - RADV_PERFTEST=aco ./install/fossilize-runner.sh
     # Bonaire (GFX7)
     - export RADV_FORCE_FAMILY="bonaire"
     - ./install/fossilize-runner.sh
-    - RADV_PERFTEST=aco ./install/fossilize-runner.sh
     # Polaris10 (GFX8)
     - export RADV_FORCE_FAMILY="polaris10"
     - ./install/fossilize-runner.sh
-    - RADV_PERFTEST=aco ./install/fossilize-runner.sh
     # Vega10 (GFX9)
     - export RADV_FORCE_FAMILY="gfx900"
     - ./install/fossilize-runner.sh
-    - RADV_PERFTEST=aco ./install/fossilize-runner.sh
     # Navi10 (GFX10)
     - export RADV_FORCE_FAMILY="gfx1010"
     - ./install/fossilize-runner.sh
-    - RADV_PERFTEST=aco ./install/fossilize-runner.sh
 
 # Traces CI
 .traces-test: