ci/fluster: Use structured tagging for Fluster

Structured tagging captures a checksum of the component we think we're
building, and verifies this through the chain.

Signed-off-by: Valentine Burley <valentine.burley@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/34787>
This commit is contained in:
Valentine Burley
2025-05-01 12:32:59 +02:00
parent 3ca7897ba9
commit b01a091856
6 changed files with 26 additions and 0 deletions

View File

@@ -10,6 +10,10 @@
# Install fluster in /fluster.
# Do a very early check to make sure the tag is correct without the need of
# setting up the environment variables locally
ci_tag_build_time_check "FLUSTER_TAG"
set -uex
section_start fluster "Installing fluster"

View File

@@ -78,10 +78,20 @@
# should make CI_BUILD_COMPONENTS="angle piglit"
CI_BUILD_COMPONENTS: "angle"
.container-builds-fluster:
variables:
FLUSTER_TAG: "${CONDITIONAL_BUILD_FLUSTER_TAG}"
.container-builds-piglit:
variables:
PIGLIT_TAG: "${CONDITIONAL_BUILD_PIGLIT_TAG}"
.container-builds-video:
extends:
- .container-builds-fluster
variables:
CI_BUILD_COMPONENTS: "fluster"
.container-builds-x86_64:
extends:
- .container-builds-angle
@@ -492,6 +502,7 @@ debian/x86_64_test-android:
debian/x86_64_test-video:
extends:
- .use-debian/x86_64_test-base
- .container-builds-video
- .export-container
variables:
MESA_IMAGE_TAG: &debian-x86_64_test-video ${DEBIAN_TEST_VIDEO_TAG}