From 5742f6f2dba0f70c8ffa68a6c7db025bcde4fa8a Mon Sep 17 00:00:00 2001 From: Valentine Burley Date: Mon, 28 Jul 2025 14:37:57 +0200 Subject: [PATCH] zink/ci: Use Weston's Xwayland instead of Xvfb Signed-off-by: Valentine Burley Part-of: --- src/gallium/drivers/zink/ci/gitlab-ci.yml | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/src/gallium/drivers/zink/ci/gitlab-ci.yml b/src/gallium/drivers/zink/ci/gitlab-ci.yml index 9a6382de374..882d794e999 100644 --- a/src/gallium/drivers/zink/ci/gitlab-ci.yml +++ b/src/gallium/drivers/zink/ci/gitlab-ci.yml @@ -17,11 +17,14 @@ zink-lavapipe: # Enable validation (except for on piglit, see deqp-zink-lavapipe.toml), logging # to stdout and aborting on unknown failures. ZINK_DEBUG: validation - XVFB_SCRIPT: "VK_DRIVER=lvp install/deqp-runner.sh" + VK_DRIVER: lvp script: | export LD_LIBRARY_PATH="$CI_PROJECT_DIR/install/lib" export LIBGL_DRIVERS_PATH="$CI_PROJECT_DIR/install/lib/dri" - xvfb-run --server-args='-noreset' bash -c ". $SCRIPTS_DIR/setup-test-env.sh && ${XVFB_SCRIPT}" + section_start weston "weston: prepare" + . "$CI_PROJECT_DIR/install/common/weston.sh" + section_end weston + $CI_PROJECT_DIR/install/deqp-runner.sh zink-venus-lavapipe: extends: @@ -41,14 +44,16 @@ zink-venus-lavapipe: LP_NUM_THREADS: 2 CROSVM_MEMORY: 12288 CROSVM_CPU: $FDO_CI_CONCURRENT - XVFB_SCRIPT: "./install/crosvm-runner.sh ./install/deqp-runner.sh" # INFO: Keep Linux version at 6.14 as 6.16 seems to have regressed # in virtio gfx device initializaiton KERNEL_TAG: "v6.14-mesa-4277" script: | export LD_LIBRARY_PATH="$CI_PROJECT_DIR/install/lib" export LIBGL_DRIVERS_PATH="$CI_PROJECT_DIR/install/lib/dri" - xvfb-run --server-args='-noreset' bash -c ". $SCRIPTS_DIR/setup-test-env.sh && ${XVFB_SCRIPT}" + section_start weston "weston: prepare" + . "$CI_PROJECT_DIR/install/common/weston.sh" + section_end weston + $CI_PROJECT_DIR/install/crosvm-runner.sh $CI_PROJECT_DIR/install/deqp-runner.sh zink-venus-lavapipe-full: extends: