From d4fa181f7b429c566399b77cb59056ef50e1c251 Mon Sep 17 00:00:00 2001
From: Vignesh Raman <vignesh.raman@collabora.com>
Date: Wed, 2 Oct 2024 13:32:20 +0530
Subject: [PATCH] ci/image-tags: add DEBIAN_PYUTILS_TAG

Enforce maximum image tag length for DEBIAN_PYUTILS_TAG
and sort the tags in order.

Signed-off-by: Vignesh Raman <vignesh.raman@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/31475>
---
 .gitlab-ci.yml            | 7 ++++---
 .gitlab-ci/image-tags.yml | 2 +-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d17b80f51f8..f4d33f902e9 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -314,19 +314,20 @@ sanity:
     - |
       set -eu
       image_tags=(
+        ALPINE_X86_64_BUILD_TAG
+        ALPINE_X86_64_LAVA_SSH_TAG
         DEBIAN_BASE_TAG
         DEBIAN_BUILD_TAG
+        DEBIAN_PYUTILS_TAG
         DEBIAN_TEST_ANDROID_TAG
         DEBIAN_TEST_GL_TAG
         DEBIAN_TEST_VK_TAG
-        ALPINE_X86_64_BUILD_TAG
-        ALPINE_X86_64_LAVA_SSH_TAG
         FEDORA_X86_64_BUILD_TAG
         KERNEL_ROOTFS_TAG
         KERNEL_TAG
         PKG_REPO_REV
-        WINDOWS_X64_MSVC_TAG
         WINDOWS_X64_BUILD_TAG
+        WINDOWS_X64_MSVC_TAG
         WINDOWS_X64_TEST_TAG
       )
       for var in "${image_tags[@]}"
diff --git a/.gitlab-ci/image-tags.yml b/.gitlab-ci/image-tags.yml
index 75dbb3df47b..0b4159672c2 100644
--- a/.gitlab-ci/image-tags.yml
+++ b/.gitlab-ci/image-tags.yml
@@ -33,7 +33,7 @@ variables:
    KERNEL_ROOTFS_TAG: "20241001-vkcts"
 
    DEBIAN_PYUTILS_IMAGE: "debian/x86_64_pyutils"
-   DEBIAN_PYUTILS_TAG: "20240912-hello-to-you"
+   DEBIAN_PYUTILS_TAG: "20241002-pyutils"
 
    ALPINE_X86_64_BUILD_TAG: "20240814-var"
    ALPINE_X86_64_LAVA_SSH_TAG: "20240401-wlproto"