From 70ce1dcacc92a816322082c8695569b6a91a1810 Mon Sep 17 00:00:00 2001 From: Guilherme Gallo Date: Mon, 31 Oct 2022 11:13:16 +0100 Subject: [PATCH] ci: Update piglit with s3 support With new S3 support, we can use JWT-only server interaction via the removal of `role-session` and `minio-host` arguments from PIGLIT_ARGS in YAML. This parameter change will come in a later commit. Signed-off-by: Guilherme Gallo Signed-off-by: Benjamin Tissoires Part-of: --- .gitlab-ci/container/build-piglit.sh | 2 +- .gitlab-ci/image-tags.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci/container/build-piglit.sh b/.gitlab-ci/container/build-piglit.sh index de52534..d932d74 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 591c91865012de4224bea551eac5d2274acf06ad +git checkout 1cd716180cfb6ef0c1fc54702460ef49e5115791 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 21540ff..7355c9b 100644 --- a/.gitlab-ci/image-tags.yml +++ b/.gitlab-ci/image-tags.yml @@ -15,7 +15,7 @@ variables: DEBIAN_X86_TEST_VK_TAG: "2022-11-03-vkd3d-proton" FEDORA_X86_BUILD_TAG: "2022-09-22-python3-ply-2" - KERNEL_ROOTFS_TAG: "2022-10-20-bindgen-zlib-cve" + KERNEL_ROOTFS_TAG: "2022-11-03-piglit" WINDOWS_X64_VS_PATH: "windows/x64_vs" WINDOWS_X64_VS_TAG: "2022-10-20-upgrade-zlib" -- 2.7.4