diff --git a/.gitlab-ci/container/build-piglit.sh b/.gitlab-ci/container/build-piglit.sh index d7f53e3753c..de525347b59 100644 --- a/.gitlab-ci/container/build-piglit.sh +++ b/.gitlab-ci/container/build-piglit.sh @@ -5,7 +5,7 @@ set -ex git clone https://gitlab.freedesktop.org/mesa/piglit.git --single-branch --no-checkout /piglit pushd /piglit -git checkout b1266fd57df3fc2574e0c88746985cd475bbecaa +git checkout 591c91865012de4224bea551eac5d2274acf06ad patch -p1 <$OLDPWD/.gitlab-ci/piglit/disable-vs_in.diff cmake -S . -B . -G Ninja -DCMAKE_BUILD_TYPE=Release $PIGLIT_OPTS $EXTRA_CMAKE_ARGS ninja $PIGLIT_BUILD_TARGETS diff --git a/.gitlab-ci/image-tags.yml b/.gitlab-ci/image-tags.yml index f516d859fc5..dd6786f4275 100644 --- a/.gitlab-ci/image-tags.yml +++ b/.gitlab-ci/image-tags.yml @@ -11,11 +11,11 @@ variables: DEBIAN_X86_TEST_BASE_IMAGE: "debian/x86_test-base" DEBIAN_X86_TEST_IMAGE_PATH: "debian/x86_test-gl" - DEBIAN_X86_TEST_GL_TAG: "2022-09-11-rusticl" - DEBIAN_X86_TEST_VK_TAG: "2022-09-11-rusticl" + DEBIAN_X86_TEST_GL_TAG: "2022-09-13-piglit-uprev-traces" + DEBIAN_X86_TEST_VK_TAG: "2022-09-13-piglit-uprev-traces" FEDORA_X86_BUILD_TAG: "2022-08-25-shellcheck" - KERNEL_ROOTFS_TAG: "2022-09-08-nouveau" + KERNEL_ROOTFS_TAG: "2022-09-13-piglit-uprev-traces" WINDOWS_X64_VS_PATH: "windows/x64_vs" WINDOWS_X64_VS_TAG: "2022-08-17-bump"