From 7fb13a915328997618b6de9b252f536fc1d9e330 Mon Sep 17 00:00:00 2001 From: Eric Engestrom Date: Wed, 24 Apr 2024 15:48:24 +0200 Subject: [PATCH] ci/image-tags: rename DEBIAN_X86_64_TEST_*_TAG to drop the x86 mention We're about to add ARM images using this same infra. Signed-off-by: Eric Engestrom Part-of: --- .gitlab-ci.yml | 6 +++--- .gitlab-ci/container/build-apitrace.sh | 4 ++-- .gitlab-ci/container/build-deqp-runner.sh | 6 +++--- .gitlab-ci/container/build-deqp.sh | 6 +++--- .gitlab-ci/container/build-fossilize.sh | 2 +- .gitlab-ci/container/build-ninetests.sh | 2 +- .gitlab-ci/container/build-piglit.sh | 4 ++-- .gitlab-ci/container/build-vkd3d-proton.sh | 2 +- .gitlab-ci/container/build-vulkan-validation.sh | 2 +- .gitlab-ci/container/build-wayland.sh | 6 +++--- .gitlab-ci/container/gitlab-ci.yml | 6 +++--- .gitlab-ci/image-tags.yml | 6 +++--- 12 files changed, 26 insertions(+), 26 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 22415218f3b..55880efa8ea 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -297,9 +297,9 @@ sanity: image_tags=( DEBIAN_BASE_TAG DEBIAN_BUILD_TAG - DEBIAN_X86_64_TEST_ANDROID_TAG - DEBIAN_X86_64_TEST_GL_TAG - DEBIAN_X86_64_TEST_VK_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 diff --git a/.gitlab-ci/container/build-apitrace.sh b/.gitlab-ci/container/build-apitrace.sh index 0697c3cb7f2..f5c8a649af4 100644 --- a/.gitlab-ci/container/build-apitrace.sh +++ b/.gitlab-ci/container/build-apitrace.sh @@ -3,8 +3,8 @@ # When changing this file, you need to bump the following # .gitlab-ci/image-tags.yml tags: -# DEBIAN_X86_64_TEST_GL_TAG -# DEBIAN_X86_64_TEST_VK_TAG +# DEBIAN_TEST_GL_TAG +# DEBIAN_TEST_VK_TAG # KERNEL_ROOTFS_TAG set -ex diff --git a/.gitlab-ci/container/build-deqp-runner.sh b/.gitlab-ci/container/build-deqp-runner.sh index b35454c4773..95c6b332a87 100644 --- a/.gitlab-ci/container/build-deqp-runner.sh +++ b/.gitlab-ci/container/build-deqp-runner.sh @@ -3,9 +3,9 @@ # When changing this file, you need to bump the following # .gitlab-ci/image-tags.yml tags: -# DEBIAN_X86_64_TEST_ANDROID_TAG -# DEBIAN_X86_64_TEST_GL_TAG -# DEBIAN_X86_64_TEST_VK_TAG +# DEBIAN_TEST_ANDROID_TAG +# DEBIAN_TEST_GL_TAG +# DEBIAN_TEST_VK_TAG # KERNEL_ROOTFS_TAG set -ex diff --git a/.gitlab-ci/container/build-deqp.sh b/.gitlab-ci/container/build-deqp.sh index 79e7e5f7020..d3151074c2f 100644 --- a/.gitlab-ci/container/build-deqp.sh +++ b/.gitlab-ci/container/build-deqp.sh @@ -3,9 +3,9 @@ # When changing this file, you need to bump the following # .gitlab-ci/image-tags.yml tags: -# DEBIAN_X86_64_TEST_ANDROID_TAG -# DEBIAN_X86_64_TEST_GL_TAG -# DEBIAN_X86_64_TEST_VK_TAG +# DEBIAN_TEST_ANDROID_TAG +# DEBIAN_TEST_GL_TAG +# DEBIAN_TEST_VK_TAG # KERNEL_ROOTFS_TAG set -ex -o pipefail diff --git a/.gitlab-ci/container/build-fossilize.sh b/.gitlab-ci/container/build-fossilize.sh index ca1204451b3..3ac670e7711 100644 --- a/.gitlab-ci/container/build-fossilize.sh +++ b/.gitlab-ci/container/build-fossilize.sh @@ -2,7 +2,7 @@ # When changing this file, you need to bump the following # .gitlab-ci/image-tags.yml tags: -# DEBIAN_X86_64_TEST_VK_TAG +# DEBIAN_TEST_VK_TAG # KERNEL_ROOTFS_TAG set -ex diff --git a/.gitlab-ci/container/build-ninetests.sh b/.gitlab-ci/container/build-ninetests.sh index d60b5fe8261..4e2d6178ae3 100644 --- a/.gitlab-ci/container/build-ninetests.sh +++ b/.gitlab-ci/container/build-ninetests.sh @@ -2,7 +2,7 @@ # When changing this file, you need to bump the following # .gitlab-ci/image-tags.yml tags: -# DEBIAN_X86_64_TEST_GL_TAG +# DEBIAN_TEST_GL_TAG set -ex -o pipefail diff --git a/.gitlab-ci/container/build-piglit.sh b/.gitlab-ci/container/build-piglit.sh index c252c0a8c76..185436fb899 100644 --- a/.gitlab-ci/container/build-piglit.sh +++ b/.gitlab-ci/container/build-piglit.sh @@ -4,8 +4,8 @@ set -ex # When changing this file, you need to bump the following # .gitlab-ci/image-tags.yml tags: -# DEBIAN_X86_64_TEST_GL_TAG -# DEBIAN_X86_64_TEST_VK_TAG +# DEBIAN_TEST_GL_TAG +# DEBIAN_TEST_VK_TAG # KERNEL_ROOTFS_TAG REV="8a6ce9c6fc5c8039665655bca4904d5601c6dba0" diff --git a/.gitlab-ci/container/build-vkd3d-proton.sh b/.gitlab-ci/container/build-vkd3d-proton.sh index b4b17883044..ae1ede62b67 100644 --- a/.gitlab-ci/container/build-vkd3d-proton.sh +++ b/.gitlab-ci/container/build-vkd3d-proton.sh @@ -2,7 +2,7 @@ # When changing this file, you need to bump the following # .gitlab-ci/image-tags.yml tags: -# DEBIAN_X86_64_TEST_VK_TAG +# DEBIAN_TEST_VK_TAG # KERNEL_ROOTFS_TAG set -ex diff --git a/.gitlab-ci/container/build-vulkan-validation.sh b/.gitlab-ci/container/build-vulkan-validation.sh index bdadf2ae195..39ea419b55c 100644 --- a/.gitlab-ci/container/build-vulkan-validation.sh +++ b/.gitlab-ci/container/build-vulkan-validation.sh @@ -2,7 +2,7 @@ # When changing this file, you need to bump the following # .gitlab-ci/image-tags.yml tags: -# DEBIAN_X86_64_TEST_GL_TAG +# DEBIAN_TEST_GL_TAG # KERNEL_ROOTFS_TAG: set -ex diff --git a/.gitlab-ci/container/build-wayland.sh b/.gitlab-ci/container/build-wayland.sh index da9089a4356..150e39b64a2 100644 --- a/.gitlab-ci/container/build-wayland.sh +++ b/.gitlab-ci/container/build-wayland.sh @@ -6,9 +6,9 @@ set -ex # When changing this file, you need to bump the following # .gitlab-ci/image-tags.yml tags: # DEBIAN_BUILD_TAG -# DEBIAN_X86_64_TEST_ANDROID_TAG -# DEBIAN_X86_64_TEST_GL_TAG -# DEBIAN_X86_64_TEST_VK_TAG +# DEBIAN_TEST_ANDROID_TAG +# DEBIAN_TEST_GL_TAG +# DEBIAN_TEST_VK_TAG # FEDORA_X86_64_BUILD_TAG # KERNEL_ROOTFS_TAG diff --git a/.gitlab-ci/container/gitlab-ci.yml b/.gitlab-ci/container/gitlab-ci.yml index c5373401098..761d4d16223 100644 --- a/.gitlab-ci/container/gitlab-ci.yml +++ b/.gitlab-ci/container/gitlab-ci.yml @@ -202,7 +202,7 @@ debian/x86_64_test-base: debian/x86_64_test-gl: extends: .use-debian/x86_64_test-base variables: - MESA_IMAGE_TAG: &debian-x86_64_test-gl ${DEBIAN_X86_64_TEST_GL_TAG} + MESA_IMAGE_TAG: &debian-x86_64_test-gl ${DEBIAN_TEST_GL_TAG} .use-debian/x86_64_test-gl: extends: @@ -218,7 +218,7 @@ debian/x86_64_test-gl: debian/x86_64_test-vk: extends: .use-debian/x86_64_test-base variables: - MESA_IMAGE_TAG: &debian-x86_64_test-vk ${DEBIAN_X86_64_TEST_VK_TAG} + MESA_IMAGE_TAG: &debian-x86_64_test-vk ${DEBIAN_TEST_VK_TAG} .use-debian/x86_64_test-vk: extends: @@ -234,7 +234,7 @@ debian/x86_64_test-vk: .debian/x86_64_test-android: extends: .use-debian/x86_64_test-base variables: - MESA_IMAGE_TAG: &debian-x86_64_test-android ${DEBIAN_X86_64_TEST_ANDROID_TAG} + MESA_IMAGE_TAG: &debian-x86_64_test-android ${DEBIAN_TEST_ANDROID_TAG} ANDROID_NDK: android-ndk-r25b .use-debian/x86_64_test-android: diff --git a/.gitlab-ci/image-tags.yml b/.gitlab-ci/image-tags.yml index 1c8e30756b3..445f6d86cf3 100644 --- a/.gitlab-ci/image-tags.yml +++ b/.gitlab-ci/image-tags.yml @@ -24,9 +24,9 @@ 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: "20240423-deqp" - DEBIAN_X86_64_TEST_GL_TAG: "20240515-piglit-8a" - DEBIAN_X86_64_TEST_VK_TAG: "20240515-piglit-8a" + DEBIAN_TEST_ANDROID_TAG: "20240423-deqp" + DEBIAN_TEST_GL_TAG: "20240515-piglit-8a" + DEBIAN_TEST_VK_TAG: "20240515-piglit-8a" KERNEL_ROOTFS_TAG: "20240516-angle" ALPINE_X86_64_BUILD_TAG: "20240517-m0ld"