fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-31 16:20:13 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

ci: use MESA_TEMPLATES_COMMIT for ci-fairy install

Browse source 
Use MESA_TEMPLATES_COMMIT instead of hard-coding the commit hash in
pip install ci-fairy.

Signed-off-by: Vignesh Raman <vignesh.raman@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/34550>
This commit is contained in:
Vignesh Raman 2025-04-18 12:33:39 +05:30 • committed by Marge Bot
parent c4aeef02e2
commit 4b3b3d4c70
6 changed files with 14 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
.gitlab-ci/container/debian/arm64_build.sh
View file

@ -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

5
.gitlab-ci/container/debian/test-base.sh
View file

@ -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

4
.gitlab-ci/container/debian/x86_64_build-base.sh
View file

@ -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

4
.gitlab-ci/container/debian/x86_64_pyutils.sh
View file

@ -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

5
.gitlab-ci/container/setup-rootfs.sh
View file

@ -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

8
.gitlab-ci/image-tags.yml
View file

@ -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"