From 985ee5441ac81a8452a72adf94bd7d9db559b77a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Corentin=20No=C3=ABl?= Date: Mon, 13 May 2024 10:14:28 +0200 Subject: [PATCH] ci: Allow to override the virglrenderer render server MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Allows this script to be used in virglrenderer CI with the actual server from virglrenderer built from top of tree. Signed-off-by: Corentin Noël Part-of: --- .gitlab-ci/common/generate-env.sh | 1 + .gitlab-ci/crosvm-runner.sh | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci/common/generate-env.sh b/.gitlab-ci/common/generate-env.sh index 9a021a75c0e..8ee1fa7606a 100755 --- a/.gitlab-ci/common/generate-env.sh +++ b/.gitlab-ci/common/generate-env.sh @@ -117,6 +117,7 @@ VARS=( TU_DEBUG USE_ANGLE VIRGL_HOST_API + VIRGL_RENDER_SERVER WAFFLE_PLATFORM VK_CPU VK_DRIVER diff --git a/.gitlab-ci/crosvm-runner.sh b/.gitlab-ci/crosvm-runner.sh index 3464e877409..e345b3b99c9 100755 --- a/.gitlab-ci/crosvm-runner.sh +++ b/.gitlab-ci/crosvm-runner.sh @@ -98,7 +98,7 @@ LIBGL_ALWAYS_SOFTWARE=${CROSVM_LIBGL_ALWAYS_SOFTWARE} \ GALLIUM_DRIVER=${CROSVM_GALLIUM_DRIVER} \ VK_DRIVER_FILES=$CI_PROJECT_DIR/install/share/vulkan/icd.d/${CROSVM_VK_DRIVER}_icd.x86_64.json \ crosvm --no-syslog run \ - --gpu "${CROSVM_GPU_ARGS}" --gpu-render-server "path=/usr/local/libexec/virgl_render_server" \ + --gpu "${CROSVM_GPU_ARGS}" --gpu-render-server "path=${VIRGL_RENDER_SERVER:-/usr/local/libexec/virgl_render_server}" \ -m "${CROSVM_MEMORY:-4096}" -c "${CROSVM_CPU:-2}" --disable-sandbox \ --shared-dir /:my_root:type=fs:writeback=true:timeout=60:cache=always \ --net "host-ip=192.168.30.1,netmask=255.255.255.0,mac=AA:BB:CC:00:00:12" \