diff --git a/.gitlab-ci/container/build-deqp.sh b/.gitlab-ci/container/build-deqp.sh index ce31004fead..8f7e8d8f869 100755 --- a/.gitlab-ci/container/build-deqp.sh +++ b/.gitlab-ci/container/build-deqp.sh @@ -292,6 +292,7 @@ if [ "$DEQP_API" = tools ]; then fi # Remove other mustpass files, since we saved off the ones we wanted to conventient locations above. +rm -rf assets/**/mustpass/ rm -rf external/**/mustpass/ rm -rf external/vulkancts/modules/vulkan/vk-main* rm -rf external/vulkancts/modules/vulkan/vk-default diff --git a/.gitlab-ci/image-tags.yml b/.gitlab-ci/image-tags.yml index b976d8761a8..3b0b05da28c 100644 --- a/.gitlab-ci/image-tags.yml +++ b/.gitlab-ci/image-tags.yml @@ -37,7 +37,7 @@ variables: DEBIAN_ARM64_TEST_IMAGE_VK_PATH: "debian/arm64_test-vk" DEBIAN_X86_64_TEST_ANDROID_IMAGE_PATH: "debian/x86_64_test-android" - DEBIAN_TEST_ANDROID_TAG: "20250310-android-cts" + DEBIAN_TEST_ANDROID_TAG: "20250312-assets" DEBIAN_TEST_GL_TAG: "20250307-piglit-70" DEBIAN_TEST_VK_TAG: "20250312-bda-fix" KERNEL_ROOTFS_TAG: "20250312-bda-fix"