From f55d119d6aa4f4a58eb2418de6a47b03c89f8aa3 Mon Sep 17 00:00:00 2001
From: Eric Engestrom <eric@igalia.com>
Date: Wed, 7 Aug 2024 11:43:25 +0200
Subject: [PATCH] ci: pass MESA_SPIRV_LOG_LEVEL from job to the test

Fixes: 4b8735cd4e2fd5fca820 ("ci: raise the log level threshold of spirv logs")
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/30546>
(cherry picked from commit b6d8459e3a0b630b5f4365a2df0974381ada82cc)
---
 .gitlab-ci/common/generate-env.sh | 1 +
 .pick_status.json                 | 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 e461379f780..8afbb1525eb 100755
--- a/.gitlab-ci/common/generate-env.sh
+++ b/.gitlab-ci/common/generate-env.sh
@@ -84,6 +84,7 @@ VARS=(
     MESA_IMAGE_PATH
     MESA_IMAGE_TAG
     MESA_LOADER_DRIVER_OVERRIDE
+    MESA_SPIRV_LOG_LEVEL
     MESA_TEMPLATES_COMMIT
     MESA_VK_ABORT_ON_DEVICE_LOSS
     MESA_VK_IGNORE_CONFORMANCE_WARNING
diff --git a/.pick_status.json b/.pick_status.json
index b5f74c1d9f0..08da588b4b3 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -3414,7 +3414,7 @@
         "description": "ci: pass MESA_SPIRV_LOG_LEVEL from job to the test",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": "4b8735cd4e2fd5fca820f91d767befaa7cf39fad",
         "notes": null