aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCorentin Noël <corentin.noel@collabora.com>2024-05-13 12:46:35 +0200
committerMarge Bot <emma+marge@anholt.net>2024-05-16 07:30:54 +0000
commit89485db28900763b880ea9f1d83d590ced7a4ca7 (patch)
tree811fb14cb06b1921aa8894966acfbfedf40a7ed8
parent3893baf5a6967bfafbd2b3991f85fda794ff63dd (diff)
downloadvirglrenderer-89485db28900763b880ea9f1d83d590ced7a4ca7.tar.gz
Uprev Mesa to 3ab023edeecab129cbbd3943478ae54254330267
https://gitlab.freedesktop.org/mesa/mesa/-/compare/69eac6dd152c8c526aea35d2c1a93077a6f6c1d7...3ab023edeecab129cbbd3943478ae54254330267 Signed-off-by: Corentin Noël <corentin.noel@collabora.com> Part-of: <https://gitlab.freedesktop.org/virgl/virglrenderer/-/merge_requests/1367>
-rw-r--r--.gitlab-ci.yml4
-rw-r--r--.gitlab-ci/expectations/virt/deqp-venus.toml2
2 files changed, 3 insertions, 3 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 17c773d4..1e7dfec5 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -17,7 +17,7 @@ variables:
#
# Pick a pipeline on https://gitlab.freedesktop.org/mesa/mesa/-/pipelines/
#
- MESA_PIPELINE_ID: 1156060
+ MESA_PIPELINE_ID: 1176182
MESA_PROJECT_PATH: mesa/mesa
STORAGE_HOST: s3.freedesktop.org
CI_REGISTRY_IMAGE: "registry.freedesktop.org/${MESA_PROJECT_PATH}"
@@ -43,7 +43,7 @@ include:
# IMPORTANT: Use a recent Mesa Git revision
# The commit ref must be in sync with the pipeline picked above
# It can be found on the pipeline page below the commit message
- ref: 69eac6dd152c8c526aea35d2c1a93077a6f6c1d7
+ ref: 3ab023edeecab129cbbd3943478ae54254330267
file:
- '/.gitlab-ci/image-tags.yml'
diff --git a/.gitlab-ci/expectations/virt/deqp-venus.toml b/.gitlab-ci/expectations/virt/deqp-venus.toml
index cf05b3eb..178df0f9 100644
--- a/.gitlab-ci/expectations/virt/deqp-venus.toml
+++ b/.gitlab-ci/expectations/virt/deqp-venus.toml
@@ -1,5 +1,5 @@
[[deqp]]
deqp = "/deqp/external/vulkancts/modules/vulkan/deqp-vk"
-caselists = [ "/deqp/mustpass/vk-master.txt" ]
+caselists = [ "/deqp/mustpass/vk-main.txt" ]
timeout = 30.0 # Starting lots of Crosvm instances simultaneously can take some time
renderer_check = "Virtio-GPU Venus.*llvmpipe"