From 4b3b3d4c703ab3153092ddf0bb7da6e2c013311f Mon Sep 17 00:00:00 2001 From: Vignesh Raman Date: Fri, 18 Apr 2025 12:33:39 +0530 Subject: [PATCH] ci: use MESA_TEMPLATES_COMMIT for ci-fairy install Use MESA_TEMPLATES_COMMIT instead of hard-coding the commit hash in pip install ci-fairy. Signed-off-by: Vignesh Raman Part-of: --- .gitlab-ci/container/debian/arm64_build.sh | 3 ++- .gitlab-ci/container/debian/test-base.sh | 5 ++--- .gitlab-ci/container/debian/x86_64_build-base.sh | 4 ++-- .gitlab-ci/container/debian/x86_64_pyutils.sh | 4 ++-- .gitlab-ci/container/setup-rootfs.sh | 5 ++--- .gitlab-ci/image-tags.yml | 8 ++++---- 6 files changed, 14 insertions(+), 15 deletions(-) diff --git a/.gitlab-ci/container/debian/arm64_build.sh b/.gitlab-ci/container/debian/arm64_build.sh index e3cf5351ca6..c9e8c020875 100644 --- a/.gitlab-ci/container/debian/arm64_build.sh +++ b/.gitlab-ci/container/debian/arm64_build.sh @@ -86,7 +86,8 @@ apt-get update apt-get -y install "${DEPS[@]}" "${EPHEMERAL[@]}" -pip3 install --break-system-packages git+http://gitlab.freedesktop.org/freedesktop/ci-templates@ffe4d1b10aab7534489f0c4bbc4c5899df17d3f2 +# Needed for ci-fairy s3cp +pip3 install --break-system-packages "ci-fairy[s3] @ git+http://gitlab.freedesktop.org/freedesktop/ci-templates@$MESA_TEMPLATES_COMMIT" arch=armhf . .gitlab-ci/container/cross_build.sh diff --git a/.gitlab-ci/container/debian/test-base.sh b/.gitlab-ci/container/debian/test-base.sh index 52b54546322..005b1d874d0 100644 --- a/.gitlab-ci/container/debian/test-base.sh +++ b/.gitlab-ci/container/debian/test-base.sh @@ -157,9 +157,8 @@ apt-get install -y --no-install-recommends "${EPHEMERAL[@]}" . .gitlab-ci/container/container_pre_build.sh -# Needed for ci-fairy, this revision is able to upload files to MinIO -# and doesn't depend on git -pip3 install --break-system-packages git+http://gitlab.freedesktop.org/freedesktop/ci-templates@ffe4d1b10aab7534489f0c4bbc4c5899df17d3f2 +# Needed for ci-fairy s3cp +pip3 install --break-system-packages "ci-fairy[s3] @ git+http://gitlab.freedesktop.org/freedesktop/ci-templates@$MESA_TEMPLATES_COMMIT" # Needed for manipulation with traces yaml files. pip3 install --break-system-packages yq diff --git a/.gitlab-ci/container/debian/x86_64_build-base.sh b/.gitlab-ci/container/debian/x86_64_build-base.sh index a7fcc8184f7..4ae6e3cdd2a 100644 --- a/.gitlab-ci/container/debian/x86_64_build-base.sh +++ b/.gitlab-ci/container/debian/x86_64_build-base.sh @@ -99,8 +99,8 @@ apt-get install -y --no-remove "${DEPS[@]}" "${EPHEMERAL[@]}" \ . .gitlab-ci/container/build-libclc.sh -# Needed for ci-fairy, this revision is able to upload files to S3 -pip3 install --break-system-packages git+http://gitlab.freedesktop.org/freedesktop/ci-templates@ffe4d1b10aab7534489f0c4bbc4c5899df17d3f2 +# Needed for ci-fairy s3cp +pip3 install --break-system-packages "ci-fairy[s3] @ git+http://gitlab.freedesktop.org/freedesktop/ci-templates@$MESA_TEMPLATES_COMMIT" . .gitlab-ci/container/install-meson.sh diff --git a/.gitlab-ci/container/debian/x86_64_pyutils.sh b/.gitlab-ci/container/debian/x86_64_pyutils.sh index b940e4e2e28..d6ee4a51b8e 100644 --- a/.gitlab-ci/container/debian/x86_64_pyutils.sh +++ b/.gitlab-ci/container/debian/x86_64_pyutils.sh @@ -54,8 +54,8 @@ apt-get update apt-get install -y --no-remove --no-install-recommends "${DEPS[@]}" "${EPHEMERAL[@]}" \ "${EXTRA_LOCAL_PACKAGES:-}" -# Needed for ci-fairy, this revision is able to upload files to S3 -pip3 install --break-system-packages git+http://gitlab.freedesktop.org/freedesktop/ci-templates@ffe4d1b10aab7534489f0c4bbc4c5899df17d3f2 +# Needed for ci-fairy s3cp +pip3 install --break-system-packages "ci-fairy[s3] @ git+http://gitlab.freedesktop.org/freedesktop/ci-templates@$MESA_TEMPLATES_COMMIT" pip3 install --break-system-packages -r bin/ci/test/requirements.txt diff --git a/.gitlab-ci/container/setup-rootfs.sh b/.gitlab-ci/container/setup-rootfs.sh index 9dedee05f76..7a433ff6579 100644 --- a/.gitlab-ci/container/setup-rootfs.sh +++ b/.gitlab-ci/container/setup-rootfs.sh @@ -9,9 +9,8 @@ set -ex export DEBIAN_FRONTEND=noninteractive -# Needed for ci-fairy, this revision is able to upload files to -# MinIO and doesn't depend on git -pip3 install --break-system-packages git+http://gitlab.freedesktop.org/freedesktop/ci-templates@ffe4d1b10aab7534489f0c4bbc4c5899df17d3f2 +# Needed for ci-fairy s3cp +pip3 install --break-system-packages "ci-fairy[s3] @ git+http://gitlab.freedesktop.org/freedesktop/ci-templates@$MESA_TEMPLATES_COMMIT" # Needed for manipulation with traces yaml files. pip3 install --break-system-packages yq diff --git a/.gitlab-ci/image-tags.yml b/.gitlab-ci/image-tags.yml index 9a015286802..b63b572e955 100644 --- a/.gitlab-ci/image-tags.yml +++ b/.gitlab-ci/image-tags.yml @@ -19,19 +19,19 @@ include: - .gitlab-ci/conditional-build-image-tags.yml variables: - DEBIAN_BASE_TAG: "20250408-virgl" + DEBIAN_BASE_TAG: "20250422-ci-fairy" - DEBIAN_BUILD_TAG: "20250324-android" + DEBIAN_BUILD_TAG: "20250422-ci-fairy" DEBIAN_TEST_ANDROID_TAG: "20250417-aosp-cts" DEBIAN_TEST_GL_TAG: "20250418-apitrace" DEBIAN_TEST_VK_TAG: "20250419-vkd3d" KERNEL_ROOTFS_TAG: "20250418-apitrace" - DEBIAN_PYUTILS_TAG: "20250321-s3cp-fix5" + DEBIAN_PYUTILS_TAG: "20250422-ci-fairy" ALPINE_X86_64_BUILD_TAG: "20250324-sphinx" - ALPINE_X86_64_LAVA_SSH_TAG: "20250321-s3cp-fix5" + ALPINE_X86_64_LAVA_SSH_TAG: "20250422-ci-fairy" FEDORA_X86_64_BUILD_TAG: "20250420-42" KERNEL_TAG: "v6.14-mesa-0bdd"