Mesa (main): ci: Increase crosvm version
GitLab Mirror
gitlab-mirror at kemper.freedesktop.org
Tue Aug 3 15:45:19 UTC 2021
Module: Mesa
Branch: main
Commit: 481e7508becf1ac639e942cf2a56eb28b8f46b3b
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=481e7508becf1ac639e942cf2a56eb28b8f46b3b
Author: Corentin Noël <corentin.noel at collabora.com>
Date: Wed Jun 16 16:04:28 2021 +0200
ci: Increase crosvm version
Also require newer dependencies.
This makes it easier to debug possible crosvm issues as a big refactor occured since the
previous commit included in the CI.
Signed-off-by: Corentin Noël <corentin.noel at collabora.com>
Acked-by: Gert Wollny <gert.wollny at collabora.com>
Reviewed-by: Tomeu Vizoso <tomeu.vizoso at collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/11320>
---
.gitlab-ci.yml | 2 +-
.gitlab-ci/container/build-crosvm.sh | 25 +++++++++++++++++++------
.gitlab-ci/crosvm-runner.sh | 2 +-
3 files changed, 21 insertions(+), 8 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 80c6cd10b26..b150c44dff2 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -425,7 +425,7 @@ debian/x86_test-gl:
variables:
FDO_DISTRIBUTION_EXEC: 'env KERNEL_URL=${KERNEL_URL} FDO_CI_CONCURRENT=${FDO_CI_CONCURRENT} bash .gitlab-ci/container/${CI_JOB_NAME}.sh'
KERNEL_URL: &kernel-rootfs-url "https://gitlab.freedesktop.org/gfx-ci/linux/-/archive/v5.13-rc5-for-mesa-ci-27df41f1e0cf/linux-v5.13-rc5-for-mesa-ci-27df41f1e0cf.tar.bz2"
- MESA_IMAGE_TAG: &debian-x86_test-gl "2021-08-02-rust-bump"
+ MESA_IMAGE_TAG: &debian-x86_test-gl "2021-08-03-crosvm-bump"
# Debian 11 based x86 test image for VK
debian/x86_test-vk:
diff --git a/.gitlab-ci/container/build-crosvm.sh b/.gitlab-ci/container/build-crosvm.sh
index 8993287b950..2fd582075af 100644
--- a/.gitlab-ci/container/build-crosvm.sh
+++ b/.gitlab-ci/container/build-crosvm.sh
@@ -10,14 +10,14 @@ AOSP_EXTERNAL_ROOT=$CROS_ROOT/aosp/external
mkdir -p $AOSP_EXTERNAL_ROOT
PLATFORM2_ROOT=/platform2
-PLATFORM2_COMMIT=2079dd5fcd61f1ac39e2fc16595956617f3f1e9e
+PLATFORM2_COMMIT=72e56e66ccf3d2ea48f5686bd1f772379c43628b
git clone --single-branch --no-checkout https://chromium.googlesource.com/chromiumos/platform2 $PLATFORM2_ROOT
pushd $PLATFORM2_ROOT
git checkout $PLATFORM2_COMMIT
popd
# minijail does not exist in upstream linux distros.
-MINIJAIL_COMMIT=5f9e3001c61626d2863dad91248ba8496c3ef511
+MINIJAIL_COMMIT=debdf5de5a0ae3b667bee2f8fb1f755b0b3f5a6c
git clone --single-branch --no-checkout https://android.googlesource.com/platform/external/minijail $AOSP_EXTERNAL_ROOT/minijail
pushd $AOSP_EXTERNAL_ROOT/minijail
git checkout $MINIJAIL_COMMIT
@@ -26,25 +26,38 @@ cp libminijail.so /usr/lib/x86_64-linux-gnu/
popd
# Pull the cras library for audio access.
-ADHD_COMMIT=5068bdd18b51de8f2d5bcff754cdecda80de8f44
+ADHD_COMMIT=a1e0869b95c845c4fe6234a7b92fdfa6acc1e809
git clone --single-branch --no-checkout https://chromium.googlesource.com/chromiumos/third_party/adhd $THIRD_PARTY_ROOT/adhd
pushd $THIRD_PARTY_ROOT/adhd
git checkout $ADHD_COMMIT
popd
-CROSVM_VERSION=f70350ba51e9631e3b7fe711c0296e041a61a499
+# Pull vHost (dataplane for virtio backend drivers)
+VHOST_COMMIT=3091854e27242d09453004b011f701fa29c0b8e8
+git clone --single-branch --no-checkout https://chromium.googlesource.com/chromiumos/third_party/rust-vmm/vhost $THIRD_PARTY_ROOT/rust-vmm/vhost
+pushd $THIRD_PARTY_ROOT/rust-vmm/vhost
+git checkout $VHOST_COMMIT
+popd
+
+CROSVM_VERSION=e42a43d880b0364b55559dbeade3af174f929001
git clone --single-branch --no-checkout https://chromium.googlesource.com/chromiumos/platform/crosvm /platform/crosvm
pushd /platform/crosvm
git checkout "$CROSVM_VERSION"
+RUSTFLAGS='-L native=/usr/local/lib' cargo install \
+ bindgen \
+ -j ${FDO_CI_CONCURRENT:-4} \
+ --root /usr/local \
+ $EXTRA_CARGO_ARGS
+
RUSTFLAGS='-L native=/usr/local/lib' cargo install \
-j ${FDO_CI_CONCURRENT:-4} \
--locked \
- --features 'default-no-sandbox gpu x virtio-gpu-next' \
+ --features 'default-no-sandbox gpu x virgl_renderer virgl_renderer_next' \
--path . \
--root /usr/local \
$EXTRA_CARGO_ARGS
popd
-rm -rf $PLATFORM2_ROOT $AOSP_EXTERNAL_ROOT/minijail $THIRD_PARTY_ROOT/adhd /platform/crosvm
+rm -rf $PLATFORM2_ROOT $AOSP_EXTERNAL_ROOT/minijail $THIRD_PARTY_ROOT/adhd $THIRD_PARTY_ROOT/rust-vmm /platform/crosvm
diff --git a/.gitlab-ci/crosvm-runner.sh b/.gitlab-ci/crosvm-runner.sh
index 4b7dc730692..32811643ac0 100755
--- a/.gitlab-ci/crosvm-runner.sh
+++ b/.gitlab-ci/crosvm-runner.sh
@@ -31,7 +31,7 @@ echo 1 > /proc/sys/net/ipv4/ip_forward
syslogd > /dev/null
crosvm run \
- --gpu gles=false,backend=3d,egl=true,surfaceless=true \
+ --gpu gles=false,backend=virglrenderer,egl=true,surfaceless=true \
-m 4096 \
-c 4 \
--disable-sandbox \
More information about the mesa-commit
mailing list