From 3c91168c71cc8a702792df76833b356b206ebd48 Mon Sep 17 00:00:00 2001 From: Yiwei Zhang Date: Fri, 4 Nov 2022 23:58:13 -0700 Subject: [PATCH] ci/venus: specify render server path to enable server config MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The render server path is required by crosvm to enable render server. v2: updated script to package server binary properly Signed-off-by: Yiwei Zhang Reviewed-by: Corentin Noël (v1) Acked-by: David Heidelberg Part-of: --- .gitlab-ci/container/lava_build.sh | 2 ++ .gitlab-ci/crosvm-runner.sh | 3 ++- .gitlab-ci/image-tags.yml | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci/container/lava_build.sh b/.gitlab-ci/container/lava_build.sh index 80f42d25f39..b92ca6123ab 100755 --- a/.gitlab-ci/container/lava_build.sh +++ b/.gitlab-ci/container/lava_build.sh @@ -200,6 +200,8 @@ if [[ ${DEBIAN_ARCH} = "amd64" ]]; then . .gitlab-ci/container/build-crosvm.sh mv /usr/local/bin/crosvm /lava-files/rootfs-${DEBIAN_ARCH}/usr/bin/ mv /usr/local/lib/$GCC_ARCH/libvirglrenderer.* /lava-files/rootfs-${DEBIAN_ARCH}/usr/lib/$GCC_ARCH/ + mkdir -p /lava-files/rootfs-${DEBIAN_ARCH}/usr/local/libexec/ + mv /usr/local/libexec/virgl* /lava-files/rootfs-${DEBIAN_ARCH}/usr/local/libexec/ fi ############### Build libdrm diff --git a/.gitlab-ci/crosvm-runner.sh b/.gitlab-ci/crosvm-runner.sh index 5b49e2873cd..f75ab1dc539 100755 --- a/.gitlab-ci/crosvm-runner.sh +++ b/.gitlab-ci/crosvm-runner.sh @@ -96,7 +96,8 @@ LIBGL_ALWAYS_SOFTWARE=${CROSVM_LIBGL_ALWAYS_SOFTWARE} \ GALLIUM_DRIVER=${CROSVM_GALLIUM_DRIVER} \ VK_ICD_FILENAMES=$CI_PROJECT_DIR/install/share/vulkan/icd.d/${CROSVM_VK_DRIVER}_icd.x86_64.json \ crosvm --no-syslog run \ - --gpu "${CROSVM_GPU_ARGS}" -m "${CROSVM_MEMORY:-4096}" -c 2 --disable-sandbox \ + --gpu "${CROSVM_GPU_ARGS}" --gpu-render-server "path=/usr/local/libexec/virgl_render_server" \ + -m "${CROSVM_MEMORY:-4096}" -c 2 --disable-sandbox \ --shared-dir /:my_root:type=fs:writeback=true:timeout=60:cache=always \ --host-ip "192.168.30.1" --netmask "255.255.255.0" --mac "AA:BB:CC:00:00:12" \ -s $VM_SOCKET \ diff --git a/.gitlab-ci/image-tags.yml b/.gitlab-ci/image-tags.yml index 370a4f28d72..f75ad4e600a 100644 --- a/.gitlab-ci/image-tags.yml +++ b/.gitlab-ci/image-tags.yml @@ -19,7 +19,7 @@ variables: ALPINE_X86_BUILD_TAG: "2022-11-15-alpine-bringup" FEDORA_X86_BUILD_TAG: "2022-09-22-python3-ply-2" - KERNEL_ROOTFS_TAG: "2023-01-09-virglrenderer" + KERNEL_ROOTFS_TAG: "2023-01-10-virglrenderer" WINDOWS_X64_VS_PATH: "windows/x64_vs" WINDOWS_X64_VS_TAG: "2022-10-20-upgrade-zlib"