From 73dcdc50d209df9e9f8d0b476f974c81ea476056 Mon Sep 17 00:00:00 2001 From: Eric Engestrom Date: Wed, 31 Jan 2024 07:49:57 +0000 Subject: [PATCH] ci: drop dash in image tags dates I put dashes in the dates when I first introduced the image tags; it made sense to improve date readability as we had only a handful of these and they barely combined. Nowadays we combine a lot of these tags to form the docker image tags, and we often run out of space. Let's remove these dashes, making dates slightly harder to read, and instead allow these two extra characters to be used in the unique/descriptive part of the tag. Part-of: --- .gitlab-ci/image-tags.yml | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/.gitlab-ci/image-tags.yml b/.gitlab-ci/image-tags.yml index 26927d7f8c8..bc8da910ca4 100644 --- a/.gitlab-ci/image-tags.yml +++ b/.gitlab-ci/image-tags.yml @@ -7,10 +7,10 @@ variables: DEBIAN_X86_64_BUILD_BASE_IMAGE: "debian/x86_64_build-base" - DEBIAN_BASE_TAG: "2024-01-28-virglrenderer" + DEBIAN_BASE_TAG: "20240128-virglrenderer" DEBIAN_X86_64_BUILD_IMAGE_PATH: "debian/x86_64_build" - DEBIAN_BUILD_TAG: "2024-01-04-find" + DEBIAN_BUILD_TAG: "20240104-find" DEBIAN_X86_64_TEST_BASE_IMAGE: "debian/x86_64_test-base" @@ -18,22 +18,22 @@ variables: DEBIAN_X86_64_TEST_IMAGE_VK_PATH: "debian/x86_64_test-vk" DEBIAN_X86_64_TEST_ANDROID_IMAGE_PATH: "debian/x86_64_test-android" - DEBIAN_X86_64_TEST_ANDROID_TAG: "2024-01-24-split" - DEBIAN_X86_64_TEST_GL_TAG: "2024-01-29-piglit-e931" - DEBIAN_X86_64_TEST_VK_TAG: "2024-01-29-piglit-e931" - ALPINE_X86_64_BUILD_TAG: "2023-01-07-libdrm2_4_119" - ALPINE_X86_64_LAVA_SSH_TAG: "2023-06-26-first-version" - FEDORA_X86_64_BUILD_TAG: "2024-01-23-teflon-3" - KERNEL_ROOTFS_TAG: "2024-01-29-piglit-e931" + DEBIAN_X86_64_TEST_ANDROID_TAG: "20240124-split" + DEBIAN_X86_64_TEST_GL_TAG: "20240129-piglit-e931" + DEBIAN_X86_64_TEST_VK_TAG: "20240129-piglit-e931" + ALPINE_X86_64_BUILD_TAG: "20230107-libdrm2_4_119" + ALPINE_X86_64_LAVA_SSH_TAG: "20230626-first-version" + FEDORA_X86_64_BUILD_TAG: "20240123-teflon-3" + KERNEL_ROOTFS_TAG: "20240129-piglit-e931" KERNEL_TAG: "v6.6.13-mesa-9916" KERNEL_REPO: "gfx-ci/linux" PKG_REPO_REV: "3cc12a2a" WINDOWS_X64_MSVC_PATH: "windows/x86_64_msvc" - WINDOWS_X64_MSVC_TAG: "2023-12-22-msvc" + WINDOWS_X64_MSVC_TAG: "20231222-msvc" WINDOWS_X64_BUILD_PATH: "windows/x86_64_build" - WINDOWS_X64_BUILD_TAG: "2024-01-17-vulkan-sdk" + WINDOWS_X64_BUILD_TAG: "20240117-vulkan-sdk" WINDOWS_X64_TEST_PATH: "windows/x86_64_test" - WINDOWS_X64_TEST_TAG: "2024-01-17-vulkan-sdk" + WINDOWS_X64_TEST_TAG: "20240117-vulkan-sdk"