X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=.gitlab-ci.yml;h=3339cea12f81c8bc7dd70783322360f91d27363b;hb=0560831593e7ae1b23e1b33023fe5b5d72d159d8;hp=5a57ddfe80a38ae9d0e1c90eb171efee5bd879e1;hpb=408b36a11dfe0bf3cbfda114c058ce7682b90483;p=mesa.git

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 5a57ddfe80a..3339cea12f8 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -237,7 +237,7 @@ x86_test-gl:
 x86_test-vk:
   extends: .use-x86_test-base
   variables:
-    FDO_DISTRIBUTION_TAG: &x86_test-vk "2020-06-02"
+    FDO_DISTRIBUTION_TAG: &x86_test-vk "2020-06-02-gles"
 
 # Debian 9 based x86 build image (old LLVM)
 x86_build_old:
@@ -274,7 +274,7 @@ arm_test-base:
     - .fdo.container-build@debian
     - .container
   variables:
-    FDO_DISTRIBUTION_TAG: &arm_test-base "2020-06-07"
+    FDO_DISTRIBUTION_TAG: &arm_test-base "2020-06-09-rsync"
 
 .use-arm_test-base:
   extends:
@@ -287,19 +287,19 @@ arm_test-base:
   needs:
     - arm_test-base
 
-# x86 image with ARM rootfses for baremetal testing.
-arm_test:
+# x86 image with ARM64 rootfs for baremetal testing.
+arm64_test:
   extends:
     - .use-arm_test-base
   variables:
-    FDO_DISTRIBUTION_TAG: &arm_test "2020-06-07"
+    FDO_DISTRIBUTION_TAG: &arm64_test "2020-06-09-rsync"
 
-.use-arm_test:
+.use-arm64_test:
   variables:
-    TAG: *arm_test
-  image: "$CI_REGISTRY_IMAGE/debian/arm_test:$TAG"
+    TAG: *arm64_test
+  image: "$CI_REGISTRY_IMAGE/debian/arm64_test:$TAG"
   needs:
-    - arm_test
+    - arm64_test
 
 # Native Windows docker builds
 #
@@ -931,6 +931,32 @@ arm64_a630_gmem:
     FD_MESA_DEBUG: nobypass
     NIR_VALIDATE: 1
 
+arm64_a630_vk:
+  extends: arm64_a630_gles2
+  variables:
+    DEQP_VER: vk
+    CI_NODE_INDEX: 1
+    CI_NODE_TOTAL: 50
+    VK_DRIVER: freedreno
+    # Force binning in the main run, which makes sure we render at
+    # least 2 bins.  This is the path that impacts the most different
+    # features.  However, we end up with flaky results in
+    # dEQP-VK.binding_model.*.geometry and dEQP-VK.glsl.*_vertex.
+    TU_DEBUG: forcebin
+
+# Do a separate sysmem pass over the testcases that really affect sysmem
+# rendering.  This is currently very flaky, leave it as an option for devs
+# to click play on in their branches.
+arm64_a630_vk_sysmem:
+  extends:
+    - arm64_a630_vk
+  variables:
+    CI_NODE_INDEX: 1
+    CI_NODE_TOTAL: 10
+    DEQP_CASELIST_FILTER: "dEQP-VK.renderpass.*"
+    DEQP_EXPECTED_FAILS: deqp-freedreno-a630-bypass-fails.txt
+    TU_DEBUG: sysmem
+
 .baremetal-test:
   extends:
     - .ci-run-policy
@@ -945,7 +971,7 @@ arm64_a630_gmem:
 arm64_a306_gles2:
   extends:
     - .baremetal-test
-    - .use-arm_test
+    - .use-arm64_test
     - .freedreno-rules
   variables:
     BM_KERNEL: /lava-files/Image.gz
@@ -964,7 +990,7 @@ arm64_a306_gles2:
   script:
     - .gitlab-ci/bare-metal/fastboot.sh
   needs:
-    - arm_test
+    - arm64_test
     - arm_build
     - meson-arm64
   tags: