From 3b086706fe72cb3a349783b62ff6a8ac2b271fda Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Corentin=20No=C3=ABl?= Date: Fri, 21 Nov 2025 10:16:22 +0100 Subject: [PATCH] ci: Uprev crosvm and virglrenderer MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Update to their latest commit on time. Signed-off-by: Corentin Noël Part-of: --- .gitlab-ci/conditional-build-image-tags.yml | 2 +- .gitlab-ci/container/build-crosvm.sh | 4 ++-- .gitlab-ci/image-tags.yml | 2 +- src/virtio/ci/venus-skips.txt | 7 ------- 4 files changed, 4 insertions(+), 11 deletions(-) diff --git a/.gitlab-ci/conditional-build-image-tags.yml b/.gitlab-ci/conditional-build-image-tags.yml index fdcb182c918..20990238ce8 100644 --- a/.gitlab-ci/conditional-build-image-tags.yml +++ b/.gitlab-ci/conditional-build-image-tags.yml @@ -1,7 +1,7 @@ variables: CONDITIONAL_BUILD_ANDROID_CTS_TAG: b018634d732f438027ec58c0383615e7 CONDITIONAL_BUILD_ANGLE_TAG: efd57e99d51361944f87b9466356b0ce - CONDITIONAL_BUILD_CROSVM_TAG: 4079babd375b09761d59eacb25a0598a + CONDITIONAL_BUILD_CROSVM_TAG: d11bef2a6b529802b5deaeaa490fd4d9 CONDITIONAL_BUILD_FLUSTER_TAG: e13f8521875ebd70e207ec0f6f3d3e5b CONDITIONAL_BUILD_PIGLIT_TAG: 21ab2c66f54777163dd038dc4cfcfde6 CONDITIONAL_BUILD_VKD3D_PROTON_TAG: 1ba830680bde0e04c0488183e1054f8d diff --git a/.gitlab-ci/container/build-crosvm.sh b/.gitlab-ci/container/build-crosvm.sh index 058fef4b483..ec5df9f4b82 100644 --- a/.gitlab-ci/container/build-crosvm.sh +++ b/.gitlab-ci/container/build-crosvm.sh @@ -16,13 +16,13 @@ section_start crosvm "Building crosvm" git config --global user.email "mesa@example.com" git config --global user.name "Mesa CI" -CROSVM_VERSION=4a6b4316155742fbfa1be7087c2ee578cfee884d +CROSVM_VERSION=f58c8e685f3f21d733861a080a0857acafd0da56 git clone --single-branch -b main --no-checkout https://chromium.googlesource.com/crosvm/crosvm /platform/crosvm pushd /platform/crosvm git checkout "$CROSVM_VERSION" git submodule update --init -VIRGLRENDERER_VERSION=06d43ce974b664f9dc521b706a0ad7f91dbf2866 +VIRGLRENDERER_VERSION=d780ef776bdd6435ef3ed657e6209a4662f6d05e rm -rf third_party/virglrenderer git clone --single-branch -b main --no-checkout https://gitlab.freedesktop.org/virgl/virglrenderer.git third_party/virglrenderer pushd third_party/virglrenderer diff --git a/.gitlab-ci/image-tags.yml b/.gitlab-ci/image-tags.yml index 9445f4583bf..25c4d1e71d3 100644 --- a/.gitlab-ci/image-tags.yml +++ b/.gitlab-ci/image-tags.yml @@ -22,7 +22,7 @@ variables: DEBIAN_BUILD_BASE_TAG: "20251016-riscv" DEBIAN_BUILD_TAG: "20250926-D3D618" - DEBIAN_TEST_BASE_TAG: "20250926-gitlab" + DEBIAN_TEST_BASE_TAG: "20251125-crosvirgl" DEBIAN_TEST_ANDROID_TAG: "20251117-angle-12" DEBIAN_TEST_GL_TAG: "20251117-angle-12" DEBIAN_TEST_VIDEO_TAG: "20250813-vector" diff --git a/src/virtio/ci/venus-skips.txt b/src/virtio/ci/venus-skips.txt index 2f151844aee..d5496e9f1ab 100644 --- a/src/virtio/ci/venus-skips.txt +++ b/src/virtio/ci/venus-skips.txt @@ -54,10 +54,3 @@ dEQP-VK.ray_tracing_pipeline.misc.cullmask_tri dEQP-VK.ray_tracing_pipeline.misc.recursiveTraces_tri_15 dEQP-VK.ray_tracing_pipeline.trace_rays_cmds_maintenance_1.indirect2_cpu.11_13_5 dEQP-VK.ray_tracing_pipeline.watertightness.closedFan2.1024 - -# These are causing oom killer to kill guest deqp -dEQP-VK.glsl.builtin.precision_fp16_storage* -dEQP-VK.spirv_assembly.instruction.compute.float_controls2.fp16.input_args.* -dEQP-VK.spirv_assembly.instruction.compute.float16.arithmetic_* -dEQP-VK.spirv_assembly.instruction.graphics.float_controls2.fp16.input_args.* -dEQP-VK.spirv_assembly.instruction.graphics.float16.arithmetic_*