Module: Mesa Branch: main Commit: 1ff4687e866043f938fa5d4b14f79393b8361ec7 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=1ff4687e866043f938fa5d4b14f79393b8361ec7
Author: Eric Engestrom <[email protected]> Date: Sat Nov 18 14:36:49 2023 +0000 ci: uprev deqp-runner from 0.16.1 to 0.18.0 Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/26270> --- .gitlab-ci/container/build-deqp-runner.sh | 8 +++++++- .gitlab-ci/image-tags.yml | 6 +++--- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci/container/build-deqp-runner.sh b/.gitlab-ci/container/build-deqp-runner.sh index 9c3bb12e736..8bc02860e33 100644 --- a/.gitlab-ci/container/build-deqp-runner.sh +++ b/.gitlab-ci/container/build-deqp-runner.sh @@ -1,6 +1,12 @@ #!/usr/bin/env bash # shellcheck disable=SC2086 # we want word splitting +# When changing this file, you need to bump the following +# .gitlab-ci/image-tags.yml tags: +# DEBIAN_BASE_TAG +# DEBIAN_X86_64_TEST_ANDROID_TAG +# KERNEL_ROOTFS_TAG + set -ex if [ -n "${DEQP_RUNNER_GIT_TAG}${DEQP_RUNNER_GIT_REV}" ]; then @@ -27,7 +33,7 @@ if [ -z "$ANDROID_NDK_HOME" ]; then else mkdir -p /deqp-runner pushd /deqp-runner - git clone --branch v0.16.1 --depth 1 https://gitlab.freedesktop.org/anholt/deqp-runner.git deqp-runner-git + git clone --branch v0.18.0 --depth 1 https://gitlab.freedesktop.org/anholt/deqp-runner.git deqp-runner-git pushd deqp-runner-git cargo install --locked \ diff --git a/.gitlab-ci/image-tags.yml b/.gitlab-ci/image-tags.yml index ace3bce39d9..a5ec9055337 100644 --- a/.gitlab-ci/image-tags.yml +++ b/.gitlab-ci/image-tags.yml @@ -7,7 +7,7 @@ variables: DEBIAN_X86_64_BUILD_BASE_IMAGE: "debian/x86_64_build-base" - DEBIAN_BASE_TAG: "2023-11-13-nak-v2" + DEBIAN_BASE_TAG: "2023-11-18-deqp-runner" DEBIAN_X86_64_BUILD_IMAGE_PATH: "debian/x86_64_build" DEBIAN_BUILD_TAG: "2023-10-30-ci-improv" @@ -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: "2023-11-06-deqp-fixes" + DEBIAN_X86_64_TEST_ANDROID_TAG: "2023-11-18-deqp-runner" DEBIAN_X86_64_TEST_GL_TAG: "2023-11-06-deqp-fixes" DEBIAN_X86_64_TEST_VK_TAG: "2023-11-06-deqp-fixes" ALPINE_X86_64_BUILD_TAG: "2023-10-30-ci-improv" ALPINE_X86_64_LAVA_SSH_TAG: "2023-06-26-first-version" FEDORA_X86_64_BUILD_TAG: "2023-10-30-ci-improv" - KERNEL_ROOTFS_TAG: "2023-11-06-deqp-fixes" + KERNEL_ROOTFS_TAG: "2023-11-18-deqp-runner" KERNEL_TAG: "v6.4.12-for-mesa-ci-f6b4ad45f48d" KERNEL_REPO: "gfx-ci/linux"
