Mesa (main): ci: Uprev virglrenderer and crosvm

[GitLab Mirror]

Module: Mesa
Branch: main
Commit: 13674245011a1cb4424d20f067c3a68188c9d495
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=13674245011a1cb4424d20f067c3a68188c9d495

Author: Corentin Noël <corentin.noel at collabora.com>
Date:   Wed Feb  9 15:17:20 2022 +0100

ci: Uprev virglrenderer and crosvm

Ensure that we are using a recent virglrenderer to catch potential regressions
early.

Signed-off-by: Corentin Noël <corentin.noel at collabora.com>
Reviewed-by: Cristian Ciocaltea <cristian.ciocaltea at collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/15023>

---

 .gitlab-ci/container/build-crosvm.sh          | 10 ++++++----
 .gitlab-ci/image-tags.yml                     |  2 +-
 src/gallium/drivers/virgl/ci/traces-virgl.yml |  2 +-
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/.gitlab-ci/container/build-crosvm.sh b/.gitlab-ci/container/build-crosvm.sh
index bd5fbfbb52d..40e2e5b0bab 100644
--- a/.gitlab-ci/container/build-crosvm.sh
+++ b/.gitlab-ci/container/build-crosvm.sh
@@ -2,13 +2,15 @@
 
 set -ex
 
-CROSVM_VERSION=d2b6a64dd31c92a284a905c0f2483d0b222b1220
-git clone --single-branch -b for-mesa-ci --no-checkout https://gitlab.freedesktop.org/tomeu/crosvm.git /platform/crosvm
+CROSVM_VERSION=f904b0ee258554bca9fed1b633b79e6d96003cf0
+git clone --single-branch -b for-mesa-ci --no-checkout https://gitlab.freedesktop.org/tintou/crosvm.git /platform/crosvm
 pushd /platform/crosvm
 git checkout "$CROSVM_VERSION"
 git submodule update --init
 
-VIRGLRENDERER_VERSION=2a5fb800c6b0ce15ad37c2c698635e3e2d27b37c
+VIRGLRENDERER_VERSION=1f1448ff100c19cf97ce1ad0d8fb5a9e63342fa6
+rm -rf third_party/virglrenderer
+git clone --single-branch -b master --no-checkout https://gitlab.freedesktop.org/virgl/virglrenderer.git third_party/virglrenderer
 pushd third_party/virglrenderer
 git checkout "$VIRGLRENDERER_VERSION"
 meson build/ $EXTRA_MESON_ARGS
@@ -31,4 +33,4 @@ RUSTFLAGS='-L native=/usr/local/lib' cargo install \
 
 popd
 
-rm -rf $PLATFORM2_ROOT $AOSP_EXTERNAL_ROOT/minijail $THIRD_PARTY_ROOT/adhd $THIRD_PARTY_ROOT/rust-vmm /platform/crosvm
+rm -rf /platform/crosvm
diff --git a/.gitlab-ci/image-tags.yml b/.gitlab-ci/image-tags.yml
index 6a420446bdc..a7655db712b 100644
--- a/.gitlab-ci/image-tags.yml
+++ b/.gitlab-ci/image-tags.yml
@@ -8,7 +8,7 @@ variables:
    DEBIAN_X86_TEST_BASE_IMAGE: "debian/x86_test-base"
 
    DEBIAN_X86_TEST_IMAGE_PATH: "debian/x86_test-gl"
-   DEBIAN_X86_TEST_GL_TAG: "2022-02-06-deqp"
+   DEBIAN_X86_TEST_GL_TAG: "2022-02-14-virgl-update"
    DEBIAN_X86_TEST_VK_TAG: "2022-02-06-deqp"
 
    FEDORA_X86_BUILD_TAG: "2021-12-31-refactor"
diff --git a/src/gallium/drivers/virgl/ci/traces-virgl.yml b/src/gallium/drivers/virgl/ci/traces-virgl.yml
index 1b9d70c941a..5c87456f2f1 100644
--- a/src/gallium/drivers/virgl/ci/traces-virgl.yml
+++ b/src/gallium/drivers/virgl/ci/traces-virgl.yml
@@ -9,7 +9,7 @@ traces:
   - path: glmark2/jellyfish.trace
     expectations:
       - device: gl-virgl
-        checksum: 48a2ad1162bf92301cedbe53edf52a6b
+        checksum: 1873b70a28539825879b530477cf6d27
   - path: glxgears/glxgears-2.trace
     expectations:
       - device: gl-virgl