From 612f56cb5eae91a197b278f6d85b164851be09d1 Mon Sep 17 00:00:00 2001
From: Valentine Burley <valentine.burley@collabora.com>
Date: Tue, 11 Feb 2025 09:28:20 +0100
Subject: [PATCH] ci/container: Include ANGLE in the arm64 test-gl container

Build ANGLE in the arm64 test-gl containers.

Signed-off-by: Valentine Burley <valentine.burley@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/33542>
---
 .gitlab-ci/container/debian/test-gl.sh | 8 ++++++++
 .gitlab-ci/image-tags.yml              | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/.gitlab-ci/container/debian/test-gl.sh b/.gitlab-ci/container/debian/test-gl.sh
index e966ea38e0c..089e4ad411b 100644
--- a/.gitlab-ci/container/debian/test-gl.sh
+++ b/.gitlab-ci/container/debian/test-gl.sh
@@ -44,6 +44,7 @@ EPHEMERAL=(
     libxrandr-dev
     libxrender-dev
     "llvm-${LLVM_VERSION}-dev"
+    "lld-${LLVM_VERSION}"
     make
     meson
     ocl-icd-opencl-dev
@@ -66,6 +67,13 @@ apt-get install -y --no-remove "${DEPS[@]}" "${EPHEMERAL[@]}" \
 
 section_end debian_setup
 
+############### Build ANGLE
+
+if [ "$DEBIAN_ARCH" == "arm64" ]; then
+  ANGLE_TARGET=linux \
+  . .gitlab-ci/container/build-angle.sh
+fi
+
 ############### Build piglit
 
 PIGLIT_OPTS="-DPIGLIT_USE_WAFFLE=ON
diff --git a/.gitlab-ci/image-tags.yml b/.gitlab-ci/image-tags.yml
index 30a1673732b..91145d8aca3 100644
--- a/.gitlab-ci/image-tags.yml
+++ b/.gitlab-ci/image-tags.yml
@@ -31,7 +31,7 @@ variables:
    DEBIAN_X86_64_TEST_ANDROID_IMAGE_PATH: "debian/x86_64_test-android"
 
    DEBIAN_TEST_ANDROID_TAG: "20250212-up-angle"
-   DEBIAN_TEST_GL_TAG: "20250204-fix-deqp"
+   DEBIAN_TEST_GL_TAG: "20250215-add-angle"
    DEBIAN_TEST_VK_TAG: "20250204-fix-deqp"
    KERNEL_ROOTFS_TAG: "20250212-up-angle"