From 0c6e647769b6ef96ff7520a3d2ff41ca6cab3989 Mon Sep 17 00:00:00 2001 From: Daniel Stone Date: Thu, 27 Mar 2025 18:29:07 +0000 Subject: [PATCH] ci: Re-enable trace jobs with updated Piglit mesa/piglit!996 fixed up Piglit to allow us to do trace downloads again, so we can now bring these jobs back. The fdno trace jobs hosted at Google are still disabled whilst we try to fix their nginx. Signed-off-by: Daniel Stone Part-of: (cherry picked from commit f6f085f50a293d18e41758bae7972dae41e9c6ff) --- .gitlab-ci/container/build-piglit.sh | 2 +- .gitlab-ci/image-tags.yml | 6 +++--- .pick_status.json | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.gitlab-ci/container/build-piglit.sh b/.gitlab-ci/container/build-piglit.sh index 45a6f2f3e0b..c138aba5016 100644 --- a/.gitlab-ci/container/build-piglit.sh +++ b/.gitlab-ci/container/build-piglit.sh @@ -10,7 +10,7 @@ uncollapsed_section_start piglit "Building piglit" # DEBIAN_TEST_VK_TAG # KERNEL_ROOTFS_TAG -REV="631b72944f56e688f56a08d26c8a9f3988801a08" +REV="68658566da1c9cd6a378b5ca36999617e26440e7" git clone https://gitlab.freedesktop.org/mesa/piglit.git --single-branch --no-checkout /piglit pushd /piglit diff --git a/.gitlab-ci/image-tags.yml b/.gitlab-ci/image-tags.yml index d370f758106..89909ed7912 100644 --- a/.gitlab-ci/image-tags.yml +++ b/.gitlab-ci/image-tags.yml @@ -28,9 +28,9 @@ variables: DEBIAN_X86_64_TEST_ANDROID_IMAGE_PATH: "debian/x86_64_test-android" DEBIAN_TEST_ANDROID_TAG: "20250130-vvless" - DEBIAN_TEST_GL_TAG: "20250130-vvless" - DEBIAN_TEST_VK_TAG: "20250130-vvless" - KERNEL_ROOTFS_TAG: "20250130-vvless" + DEBIAN_TEST_GL_TAG: "20250327-piglit-250" + DEBIAN_TEST_VK_TAG: "20250327-piglit-250" + KERNEL_ROOTFS_TAG: "20250327-trace-250" DEBIAN_PYUTILS_IMAGE: "debian/x86_64_pyutils" DEBIAN_PYUTILS_TAG: "20250129-lavacli" diff --git a/.pick_status.json b/.pick_status.json index bf6b133125c..81bf549a8f5 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -74,7 +74,7 @@ "description": "ci: Re-enable trace jobs with updated Piglit", "nominated": false, "nomination_type": 0, - "resolution": 4, + "resolution": 1, "main_sha": null, "because_sha": null, "notes": null