From df1a89b9e1c1579bd0aeef01ac6d6bf026809905 Mon Sep 17 00:00:00 2001 From: Eric Engestrom Date: Thu, 26 Sep 2024 16:53:11 +0200 Subject: [PATCH] ci/deqp: make sure the git commit hash of deqp is stable across rebuilds This makes it much easier to verify whether two jobs are running the same deqp build. Part-of: --- .gitlab-ci/container/build-deqp.sh | 4 ++-- .gitlab-ci/image-tags.yml | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.gitlab-ci/container/build-deqp.sh b/.gitlab-ci/container/build-deqp.sh index 1c566759e78..21877f946de 100644 --- a/.gitlab-ci/container/build-deqp.sh +++ b/.gitlab-ci/container/build-deqp.sh @@ -112,14 +112,14 @@ do PATCH_URL="https://github.com/KhronosGroup/VK-GL-CTS/commit/$commit.patch" echo "Apply patch to ${DEQP_API} CTS from $PATCH_URL" curl -L --retry 4 -f --retry-all-errors --retry-delay 60 $PATCH_URL | \ - git am - + GIT_COMMITTER_DATE=$(date -d@0) git am - done cts_patch_files="${deqp_api}_cts_patch_files[@]" for patch in "${!cts_patch_files}" do echo "Apply patch to ${DEQP_API} CTS from $patch" - git am < $OLDPWD/.gitlab-ci/container/patches/$patch + GIT_COMMITTER_DATE=$(date -d@0) git am < $OLDPWD/.gitlab-ci/container/patches/$patch done { diff --git a/.gitlab-ci/image-tags.yml b/.gitlab-ci/image-tags.yml index 4fb96f6498d..2c88121aa52 100644 --- a/.gitlab-ci/image-tags.yml +++ b/.gitlab-ci/image-tags.yml @@ -27,10 +27,10 @@ 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: "20240906-deqp" - DEBIAN_TEST_GL_TAG: "20240918-piglit-e9" - DEBIAN_TEST_VK_TAG: "20240918-piglit-e9" - KERNEL_ROOTFS_TAG: "20240918-piglit-e9" + DEBIAN_TEST_ANDROID_TAG: "20240926-git-hash" + DEBIAN_TEST_GL_TAG: "20240926-git-hash" + DEBIAN_TEST_VK_TAG: "20240926-git-hash" + KERNEL_ROOTFS_TAG: "20240926-git-hash" DEBIAN_PYUTILS_IMAGE: "debian/x86_64_pyutils" DEBIAN_PYUTILS_TAG: "20240912-hello-to-you"