From 9bbbe90f060914448910d17a38d815ac24db6030 Mon Sep 17 00:00:00 2001 From: Eric Engestrom Date: Thu, 21 Mar 2024 13:11:26 +0000 Subject: [PATCH] ci: enable MESA_VK_ABORT_ON_DEVICE_LOSS globally This makes all vulkan drivers abort on DEVICE_LOST, which is better than the current error in deqp-runner because deqp has added a new DeviceLost test status but deqp-runner doesn't understand it yet (the next release will though), breaking jobs when this happens. Disable it on zink for now, as EGL test intentionally cause this in some tests and we don't want them to start crashing. Part-of: --- .gitlab-ci.yml | 2 ++ src/gallium/drivers/zink/ci/gitlab-ci-inc.yml | 1 + 2 files changed, 3 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 90861baa1f1..b0f628b97c5 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -87,6 +87,8 @@ variables: ARTIFACTS_BASE_URL: https://${CI_PROJECT_ROOT_NAMESPACE}.${CI_PAGES_DOMAIN}/-/${CI_PROJECT_NAME}/-/jobs/${CI_JOB_ID}/artifacts # Python scripts for structured logger PYTHONPATH: "$PYTHONPATH:$CI_PROJECT_DIR/install" + # Drop once deqp-runner is upgraded to > 0.18.0 + MESA_VK_ABORT_ON_DEVICE_LOSS: 1 default: before_script: diff --git a/src/gallium/drivers/zink/ci/gitlab-ci-inc.yml b/src/gallium/drivers/zink/ci/gitlab-ci-inc.yml index 225df18e6b6..97f39f344af 100644 --- a/src/gallium/drivers/zink/ci/gitlab-ci-inc.yml +++ b/src/gallium/drivers/zink/ci/gitlab-ci-inc.yml @@ -94,6 +94,7 @@ variables: MESA_LOADER_DRIVER_OVERRIDE: "zink" FLAKES_CHANNEL: "#zink-ci" + MESA_VK_ABORT_ON_DEVICE_LOSS: 0 .zink-trace-test: extends: