From 987f9a67e02dc5abf56754c5af70a6065673a22e Mon Sep 17 00:00:00 2001 From: Sergi Blanch Torne Date: Wed, 16 Nov 2022 15:41:15 +0100 Subject: [PATCH] ci: insert debian/x86_test-vk in image tags Using the variable DEBIAN_X86_TEST_IMAGE_PATH in a Vulkan test, we realize the reference to the Vulkan one is missing. Even more, hardcoded within mesa. With this, a variable for Vulkan image has a reference VK on it, as well as the GL one. But the old variable is still there, pointing to the value that can be expected to avoid any brake on other CI elements. Also, updated the build tag to regenerate the image. Signed-off-by: Sergi Blanch Torne Reviewed-by: David Heidelberg Part-of: --- .gitlab-ci/container/gitlab-ci.yml | 4 ++-- .gitlab-ci/image-tags.yml | 7 +++++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci/container/gitlab-ci.yml b/.gitlab-ci/container/gitlab-ci.yml index e38a9d564e0..43316f3ec74 100644 --- a/.gitlab-ci/container/gitlab-ci.yml +++ b/.gitlab-ci/container/gitlab-ci.yml @@ -213,7 +213,7 @@ debian/x86_test-gl: - .set-image-base-tag variables: MESA_BASE_TAG: *debian-x86_test-base - MESA_IMAGE_PATH: ${DEBIAN_X86_TEST_IMAGE_PATH} + MESA_IMAGE_PATH: ${DEBIAN_X86_TEST_IMAGE_GL_PATH} MESA_IMAGE_TAG: *debian-x86_test-gl needs: - debian/x86_test-gl @@ -229,7 +229,7 @@ debian/x86_test-vk: - .set-image-base-tag variables: MESA_BASE_TAG: *debian-x86_test-base - MESA_IMAGE_PATH: "debian/x86_test-vk" + MESA_IMAGE_PATH: ${DEBIAN_X86_TEST_IMAGE_VK_PATH} MESA_IMAGE_TAG: *debian-x86_test-vk needs: - debian/x86_test-vk diff --git a/.gitlab-ci/image-tags.yml b/.gitlab-ci/image-tags.yml index 2d24aca6b02..ddfb62e3a14 100644 --- a/.gitlab-ci/image-tags.yml +++ b/.gitlab-ci/image-tags.yml @@ -10,9 +10,12 @@ variables: DEBIAN_X86_TEST_BASE_IMAGE: "debian/x86_test-base" - DEBIAN_X86_TEST_IMAGE_PATH: "debian/x86_test-gl" + DEBIAN_X86_TEST_IMAGE_GL_PATH: "debian/x86_test-gl" + DEBIAN_X86_TEST_IMAGE_VK_PATH: "debian/x86_test-vk" + DEBIAN_X86_TEST_IMAGE_PATH: ${DEBIAN_X86_TEST_IMAGE_GL_PATH} + DEBIAN_X86_TEST_GL_TAG: "2022-11-08-deqp-runner" - DEBIAN_X86_TEST_VK_TAG: "2022-11-08-deqp-runner" + DEBIAN_X86_TEST_VK_TAG: "2022-11-17-test-img-path" ALPINE_X86_BUILD_TAG: "2022-11-15-alpine-bringup" FEDORA_X86_BUILD_TAG: "2022-09-22-python3-ply-2"