From 26a1e93f7ecbb2d59fec7f5ad0fdcada9e1f10da Mon Sep 17 00:00:00 2001 From: Yonggang Luo Date: Fri, 5 Aug 2022 03:59:37 +0800 Subject: [PATCH] ci/windows: Setup proper MESA_IMAGE_TAG for Windows build/test image Signed-off-by: Yonggang Luo Reviewed-by: Jesse Natalie Part-of: --- .gitlab-ci/container/gitlab-ci.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci/container/gitlab-ci.yml b/.gitlab-ci/container/gitlab-ci.yml index f341e9ed91b..6d0e6cdf700 100644 --- a/.gitlab-ci/container/gitlab-ci.yml +++ b/.gitlab-ci/container/gitlab-ci.yml @@ -409,7 +409,7 @@ windows_build_vs2019: - !reference [.build-rules, rules] variables: MESA_IMAGE_PATH: &windows_build_image_path ${WINDOWS_X64_BUILD_PATH} - MESA_IMAGE_TAG: &windows_build_image_tag ${WINDOWS_X64_BUILD_TAG} + MESA_IMAGE_TAG: &windows_build_image_tag ${MESA_BASE_IMAGE_TAG}--${WINDOWS_X64_BUILD_TAG} DOCKERFILE: Dockerfile_build MESA_BASE_IMAGE_PATH: *windows_vs_image_path MESA_BASE_IMAGE_TAG: *windows_vs_image_tag @@ -429,7 +429,7 @@ windows_test_vs2019: - !reference [.build-rules, rules] variables: MESA_IMAGE_PATH: &windows_test_image_path ${WINDOWS_X64_TEST_PATH} - MESA_IMAGE_TAG: &windows_test_image_tag ${WINDOWS_X64_BUILD_TAG}--${WINDOWS_X64_TEST_TAG} + MESA_IMAGE_TAG: &windows_test_image_tag ${MESA_BASE_IMAGE_TAG}--${WINDOWS_X64_TEST_TAG} DOCKERFILE: Dockerfile_test MESA_BASE_IMAGE_PATH: *windows_vs_image_path MESA_BASE_IMAGE_TAG: *windows_vs_image_tag @@ -445,6 +445,7 @@ windows_test_vs2019: variables: MESA_IMAGE_PATH: *windows_build_image_path MESA_IMAGE_TAG: *windows_build_image_tag + MESA_BASE_IMAGE_TAG: *windows_vs_image_tag needs: - windows_build_vs2019 @@ -456,3 +457,4 @@ windows_test_vs2019: variables: MESA_IMAGE_PATH: *windows_test_image_path MESA_IMAGE_TAG: *windows_test_image_tag + MESA_BASE_IMAGE_TAG: *windows_vs_image_tag