diff --git a/.gitlab-ci/container/build-deqp.sh b/.gitlab-ci/container/build-deqp.sh index 2c27288ae87..473075f017a 100644 --- a/.gitlab-ci/container/build-deqp.sh +++ b/.gitlab-ci/container/build-deqp.sh @@ -57,6 +57,10 @@ cts_patch_files=( # Android specific patches. build-deqp_Allow-running-on-Android-from-the-command-line.patch build-deqp_Android-prints-to-stdout-instead-of-logcat.patch + + # Change zlib URL because the one from zlib.net requires a human-verification + # Forward-port of b61f15f09adb6b7c9eefc7f7c44612c0c390abe5 into modern dEQP codebase + build-deqp_Change-zlib-URL-because-the-one-from-zlib.net-requir.patch ) for patch in "${cts_patch_files[@]}" diff --git a/.gitlab-ci/container/patches/build-deqp_Change-zlib-URL-because-the-one-from-zlib.net-requir.patch b/.gitlab-ci/container/patches/build-deqp_Change-zlib-URL-because-the-one-from-zlib.net-requir.patch new file mode 100644 index 00000000000..78f4106dc13 --- /dev/null +++ b/.gitlab-ci/container/patches/build-deqp_Change-zlib-URL-because-the-one-from-zlib.net-requir.patch @@ -0,0 +1,33 @@ +From 5f0e537c89d9f3b356166c409303b38777f2e3de Mon Sep 17 00:00:00 2001 +From: Lorenzo Dal Col +Date: Thu, 18 Jan 2024 22:13:49 +0100 +Subject: [PATCH] Change zlib URL because the one from zlib.net requires a + human-verification + +VK-GL-CTS issue: 4895 + +This does not affect any test. + +Change-Id: I7002062f46f957dd865d66387dde3e53d3b2c5f0 +Signed-off-by: Eric Engestrom +--- + external/fetch_sources.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/external/fetch_sources.py b/external/fetch_sources.py +index 081aea023d5683698653..7b107d5026b3dbb246c2 100644 +--- a/external/fetch_sources.py ++++ b/external/fetch_sources.py +@@ -290,7 +290,7 @@ def postExtractLibpng (path): + + PACKAGES = [ + SourcePackage( +- "http://zlib.net/fossils/zlib-1.2.13.tar.gz", ++ "https://github.com/madler/zlib/releases/download/v1.2.13/zlib-1.2.13.tar.gz", + "b3a24de97a8fdbc835b9833169501030b8977031bcb54b3b3ac13740f846ab30", + "zlib"), + SourcePackage( +-- +Cheers, + Eric + diff --git a/.gitlab-ci/image-tags.yml b/.gitlab-ci/image-tags.yml index 8c161ed070f..e3c3f05725e 100644 --- a/.gitlab-ci/image-tags.yml +++ b/.gitlab-ci/image-tags.yml @@ -18,14 +18,14 @@ 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-14-runner" - DEBIAN_X86_64_TEST_GL_TAG: "2024-01-16-kmod" - DEBIAN_X86_64_TEST_VK_TAG: "2024-01-14-check-deqp" + DEBIAN_X86_64_TEST_ANDROID_TAG: "2024-01-19-zlib" + DEBIAN_X86_64_TEST_GL_TAG: "2024-01-19-zlib" + DEBIAN_X86_64_TEST_VK_TAG: "2024-01-19-zlib" 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-06-libdrm" - KERNEL_ROOTFS_TAG: "2024-01-14-runner" + KERNEL_ROOTFS_TAG: "2024-01-19-zlib" KERNEL_TAG: "v6.6.4-for-mesa-ci-e4f4c500f7fb" KERNEL_REPO: "gfx-ci/linux" PKG_REPO_REV: "67f2c46b"