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

ci/baremetal: Use container rootfs

Browse source 
Switch baremetal to use the new artifacts from the test-gl and test-vk
containers.

Signed-off-by: Valentine Burley <valentine.burley@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/34451>
This commit is contained in:
Valentine Burley 2025-04-07 16:20:20 +02:00 • committed by Marge Bot
parent e16d422da5
commit 13db56320b
2 changed files with 17 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
.gitlab-ci/container/baremetal_build.sh
View file

@ -1,4 +1,5 @@
#!/usr/bin/env bash #!/usr/bin/env bash
# shellcheck disable=SC2154 # arch is assigned in previous scripts
set -e set -e
set -o xtrace set -o xtrace
@ -6,11 +7,12 @@ set -o xtrace
# Fetch the arm-built rootfs image and unpack it in our x86_64 container (saves # Fetch the arm-built rootfs image and unpack it in our x86_64 container (saves
# network transfer, disk usage, and runtime on test jobs) # network transfer, disk usage, and runtime on test jobs)
# shellcheck disable=SC2154 # arch is assigned in previous scripts S3_PATH="https://${S3_HOST}/${S3_KERNEL_BUCKET}"
if curl --fail -L -s "${ARTIFACTS_PREFIX}/${FDO_UPSTREAM_REPO}/${ARTIFACTS_SUFFIX}/${arch}/done"; then
ARTIFACTS_URL="${ARTIFACTS_PREFIX}/${FDO_UPSTREAM_REPO}/${ARTIFACTS_SUFFIX}/${arch}" if curl -L --retry 3 -f --retry-delay 10 -s --head "${S3_PATH}/${FDO_UPSTREAM_REPO}/${LAVA_DISTRIBUTION_TAG}"; then
ARTIFACTS_URL="${S3_PATH}/${FDO_UPSTREAM_REPO}/${LAVA_DISTRIBUTION_TAG}"
else else
ARTIFACTS_URL="${ARTIFACTS_PREFIX}/${CI_PROJECT_PATH}/${ARTIFACTS_SUFFIX}/${arch}" ARTIFACTS_URL="${S3_PATH}/${CI_PROJECT_PATH}/${LAVA_DISTRIBUTION_TAG}"
fi fi
curl -L --retry 4 -f --retry-all-errors --retry-delay 60 \ curl -L --retry 4 -f --retry-all-errors --retry-delay 60 \

28
.gitlab-ci/container/gitlab-ci.yml
View file

@ -696,19 +696,17 @@ kernel+rootfs_arm32:
# Don't want the .container rules # Don't want the .container rules
- .container+build-rules - .container+build-rules
variables: variables:
FDO_DISTRIBUTION_TAG: "${MESA_IMAGE_TAG}--${MESA_ROOTFS_TAG}--${KERNEL_TAG}--${MESA_TEMPLATES_COMMIT}" FDO_DISTRIBUTION_TAG: "${MESA_IMAGE_TAG}--${KERNEL_TAG}--${MESA_TEMPLATES_COMMIT}"
ARTIFACTS_PREFIX: "https://${S3_HOST}/${S3_KERNEL_BUCKET}"
ARTIFACTS_SUFFIX: "${MESA_ROOTFS_TAG}--${KERNEL_TAG}--${MESA_ARTIFACTS_TAG}--${MESA_TEMPLATES_COMMIT}"
MESA_ARTIFACTS_TAG: *debian-arm64_build MESA_ARTIFACTS_TAG: *debian-arm64_build
MESA_ROOTFS_TAG: *kernel-rootfs
debian/baremetal_arm32_test-gl: debian/baremetal_arm32_test-gl:
extends: extends:
- .debian/baremetal_arm_test - .debian/baremetal_arm_test
needs: needs:
- kernel+rootfs_arm32 - debian/arm32_test-gl
variables: variables:
MESA_IMAGE_TAG: &baremetal-arm32_test-gl "${DEBIAN_BASE_TAG}--${PKG_REPO_REV}" MESA_IMAGE_TAG: &baremetal-arm32_test-gl "${DEBIAN_TEST_GL_TAG}--${DEBIAN_BASE_TAG}--${PKG_REPO_REV}"
LAVA_DISTRIBUTION_TAG: !reference [debian/arm32_test-gl, variables, LAVA_DISTRIBUTION_TAG]
debian/baremetal_arm64_test-gl: debian/baremetal_arm64_test-gl:
extends: extends:
@ -716,7 +714,8 @@ debian/baremetal_arm64_test-gl:
needs: needs:
- debian/arm64_test-gl - debian/arm64_test-gl
variables: variables:
MESA_IMAGE_TAG: &baremetal-arm64_test-gl "${DEBIAN_BASE_TAG}--${PKG_REPO_REV}" MESA_IMAGE_TAG: &baremetal-arm64_test-gl "${DEBIAN_TEST_GL_TAG}--${DEBIAN_BASE_TAG}--${PKG_REPO_REV}"
LAVA_DISTRIBUTION_TAG: !reference [debian/arm64_test-gl, variables, LAVA_DISTRIBUTION_TAG]
debian/baremetal_arm64_test-vk: debian/baremetal_arm64_test-vk:
extends: extends:
@ -724,12 +723,11 @@ debian/baremetal_arm64_test-vk:
needs: needs:
- debian/arm64_test-vk - debian/arm64_test-vk
variables: variables:
MESA_IMAGE_TAG: &baremetal-arm64_test-vk "${DEBIAN_BASE_TAG}--${PKG_REPO_REV}" MESA_IMAGE_TAG: &baremetal-arm64_test-vk "${DEBIAN_TEST_VK_TAG}--${DEBIAN_BASE_TAG}--${PKG_REPO_REV}"
LAVA_DISTRIBUTION_TAG: !reference [debian/arm64_test-vk, variables, LAVA_DISTRIBUTION_TAG]
.use-debian/baremetal_arm32_test-gl: .use-debian/baremetal_arm32_test-gl:
image: "$CI_REGISTRY_IMAGE/${MESA_IMAGE_PATH}:${MESA_IMAGE_TAG}--${MESA_ROOTFS_TAG}--${KERNEL_TAG}--${MESA_TEMPLATES_COMMIT}" image: "$CI_REGISTRY_IMAGE/${MESA_IMAGE_PATH}:${MESA_IMAGE_TAG}--${KERNEL_TAG}--${MESA_TEMPLATES_COMMIT}"
extends:
- .use-debian/baremetal_arm_test
variables: variables:
MESA_IMAGE_PATH: "debian/baremetal_arm32_test-gl" MESA_IMAGE_PATH: "debian/baremetal_arm32_test-gl"
MESA_IMAGE_TAG: *baremetal-arm32_test-gl MESA_IMAGE_TAG: *baremetal-arm32_test-gl
@ -737,9 +735,7 @@ debian/baremetal_arm64_test-vk:
- debian/baremetal_arm_test - debian/baremetal_arm_test
.use-debian/baremetal_arm64_test-gl: .use-debian/baremetal_arm64_test-gl:
image: "$CI_REGISTRY_IMAGE/${MESA_IMAGE_PATH}:${MESA_IMAGE_TAG}--${MESA_ROOTFS_TAG}--${KERNEL_TAG}--${MESA_TEMPLATES_COMMIT}" image: "$CI_REGISTRY_IMAGE/${MESA_IMAGE_PATH}:${MESA_IMAGE_TAG}--${KERNEL_TAG}--${MESA_TEMPLATES_COMMIT}"
extends:
- .use-debian/baremetal_arm_test
variables: variables:
MESA_IMAGE_PATH: "debian/baremetal_arm64_test-gl" MESA_IMAGE_PATH: "debian/baremetal_arm64_test-gl"
MESA_IMAGE_TAG: *baremetal-arm64_test-gl MESA_IMAGE_TAG: *baremetal-arm64_test-gl
@ -747,9 +743,7 @@ debian/baremetal_arm64_test-vk:
- debian/baremetal_arm_test - debian/baremetal_arm_test
.use-debian/baremetal_arm64_test-vk: .use-debian/baremetal_arm64_test-vk:
image: "$CI_REGISTRY_IMAGE/${MESA_IMAGE_PATH}:${MESA_IMAGE_TAG}--${MESA_ROOTFS_TAG}--${KERNEL_TAG}--${MESA_TEMPLATES_COMMIT}" image: "$CI_REGISTRY_IMAGE/${MESA_IMAGE_PATH}:${MESA_IMAGE_TAG}--${KERNEL_TAG}--${MESA_TEMPLATES_COMMIT}"
extends:
- .use-debian/baremetal_arm_test
variables: variables:
MESA_IMAGE_PATH: "debian/baremetal_arm64_test-vk" MESA_IMAGE_PATH: "debian/baremetal_arm64_test-vk"
MESA_IMAGE_TAG: *baremetal-arm64_test-vk MESA_IMAGE_TAG: *baremetal-arm64_test-vk