summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVignesh Raman <vignesh.raman@collabora.com>2024-10-02 13:32:20 +0530
committerMarge Bot <emma+marge@anholt.net>2024-10-02 13:29:33 +0000
commitd4fa181f7b429c566399b77cb59056ef50e1c251 (patch)
treeb9a4ec1c5c5961dbe827d942f2c3a98c6886d0cb
parent30dc71b060549f7b36df2525b35b2dd61bf35896 (diff)
ci/image-tags: add DEBIAN_PYUTILS_TAGHEADmain
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>
-rw-r--r--.gitlab-ci.yml7
-rw-r--r--.gitlab-ci/image-tags.yml2
2 files changed, 5 insertions, 4 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d17b80f51f85d..f4d33f902e981 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 75dbb3df47b0e..0b4159672c272 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"