From 0a06db8fb983816163dba72279aa386aa971057d Mon Sep 17 00:00:00 2001 From: Yiwei Zhang Date: Fri, 30 Sep 2022 20:30:41 +0000 Subject: [PATCH] ci/venus: enable render server for venus testing MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Render server config will soon become a mandatory requirement for venus. v2: updated DEBIAN_BASE_TAG and KERNEL_ROOTFS_TAG Signed-off-by: Yiwei Zhang Reveiwed-by: Ryan Neph (v1) Reveiwed-by: Dmitry Osipenko (v1) Reviewed-by: Corentin Noël (v2) Part-of: --- .gitlab-ci/container/build-crosvm.sh | 2 +- .gitlab-ci/image-tags.yml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci/container/build-crosvm.sh b/.gitlab-ci/container/build-crosvm.sh index 243c384355a..cfee1597ef3 100644 --- a/.gitlab-ci/container/build-crosvm.sh +++ b/.gitlab-ci/container/build-crosvm.sh @@ -17,7 +17,7 @@ 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/ -Dvenus-experimental=true $EXTRA_MESON_ARGS +meson build/ -Drender-server=true -Drender-server-worker=process -Dvenus-experimental=true $EXTRA_MESON_ARGS ninja -C build install popd diff --git a/.gitlab-ci/image-tags.yml b/.gitlab-ci/image-tags.yml index 934831ae6e1..0ea42d8e6b4 100644 --- a/.gitlab-ci/image-tags.yml +++ b/.gitlab-ci/image-tags.yml @@ -1,6 +1,6 @@ variables: DEBIAN_X86_BUILD_BASE_IMAGE: "debian/x86_build-base" - DEBIAN_BASE_TAG: "2022-09-28-crosvm" + DEBIAN_BASE_TAG: "2022-10-04-vn-render-server" DEBIAN_X86_BUILD_IMAGE_PATH: "debian/x86_build" DEBIAN_BUILD_TAG: "2022-09-26-clc" @@ -15,7 +15,7 @@ variables: DEBIAN_X86_TEST_VK_TAG: "2022-09-27-clc" FEDORA_X86_BUILD_TAG: "2022-09-22-python3-ply-2" - KERNEL_ROOTFS_TAG: "2022-09-28-crosvm" + KERNEL_ROOTFS_TAG: "2022-10-04-vn-render-server" WINDOWS_X64_VS_PATH: "windows/x64_vs" WINDOWS_X64_VS_TAG: "2022-08-17-bump"