From 1668feefb496b99062fdec0e9ea90d6bd12e3d8e Mon Sep 17 00:00:00 2001
From: Valentine Burley <valentine.burley@collabora.com>
Date: Fri, 28 Mar 2025 15:17:07 +0100
Subject: [PATCH] ci: Make it possible to use ANGLE traces on other
 architectures

Don't hardcode amd64 architecture, use PIGLIT_REPLAY_ANGLE_ARCH to make
it easier to opt in for ANGLE traces on arm64 in the future.

Signed-off-by: Valentine Burley <valentine.burley@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/34308>
---
 .gitlab-ci/common/export-gitlab-job-env-for-dut.sh | 3 ++-
 .gitlab-ci/piglit/piglit-traces.sh                 | 5 ++---
 src/amd/ci/gitlab-ci.yml                           | 3 ++-
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/.gitlab-ci/common/export-gitlab-job-env-for-dut.sh b/.gitlab-ci/common/export-gitlab-job-env-for-dut.sh
index 554a20f701d..330e036239d 100755
--- a/.gitlab-ci/common/export-gitlab-job-env-for-dut.sh
+++ b/.gitlab-ci/common/export-gitlab-job-env-for-dut.sh
@@ -3,6 +3,7 @@
 VARS=(
     ACO_DEBUG
     ANGLE_TAG
+    ANGLE_TRACE_FILES_TAG
     ANV_DEBUG
     ARTIFACTS_BASE_URL
     ASAN_OPTIONS
@@ -99,7 +100,7 @@ VARS=(
     PIGLIT_OPTIONS
     PIGLIT_PLATFORM
     PIGLIT_PROFILES
-    PIGLIT_REPLAY_ANGLE_TAG
+    PIGLIT_REPLAY_ANGLE_ARCH
     PIGLIT_REPLAY_ARTIFACTS_BASE_URL
     PIGLIT_REPLAY_DEVICE_NAME
     PIGLIT_REPLAY_EXTRA_ARGS
diff --git a/.gitlab-ci/piglit/piglit-traces.sh b/.gitlab-ci/piglit/piglit-traces.sh
index 6490983ff52..a04cad9c091 100755
--- a/.gitlab-ci/piglit/piglit-traces.sh
+++ b/.gitlab-ci/piglit/piglit-traces.sh
@@ -164,9 +164,8 @@ RUN_CMD="export LD_LIBRARY_PATH=$__LD_LIBRARY_PATH; $SANITY_MESA_VERSION_CMD &&
 rm -rf replayer-db
 
 # ANGLE: download compiled ANGLE runtime and the compiled restricted traces (all-in-one package)
-if [ -n "$PIGLIT_REPLAY_ANGLE_TAG" ]; then
-  ARCH="amd64"
-  FILE="angle-bin-${ARCH}-${PIGLIT_REPLAY_ANGLE_TAG}.tar.zst"
+if [ -n "$PIGLIT_REPLAY_ANGLE_ARCH" ]; then
+  FILE="angle-bin-${PIGLIT_REPLAY_ANGLE_ARCH}-${ANGLE_TRACE_FILES_TAG}.tar.zst"
   curl --location --fail --retry-all-errors --retry 4 --retry-delay 60 \
     --header "Authorization: Bearer $(cat "${S3_JWT_FILE}")" \
     "https://s3.freedesktop.org/mesa-tracie-private/${FILE}" --output "${FILE}"
diff --git a/src/amd/ci/gitlab-ci.yml b/src/amd/ci/gitlab-ci.yml
index 7dc4b5a182a..8f411e8519a 100644
--- a/src/amd/ci/gitlab-ci.yml
+++ b/src/amd/ci/gitlab-ci.yml
@@ -97,7 +97,8 @@ radv-raven-traces-restricted:
     - .radv-collabora-restricted-rules
   variables:
     HWCI_START_WESTON: 1
-    PIGLIT_REPLAY_ANGLE_TAG: "2023-02-10-1"
+    ANGLE_TRACE_FILES_TAG: "2023-02-10-1"
+    PIGLIT_REPLAY_ANGLE_ARCH: amd64
     PIGLIT_TRACES_FILE: restricted-traces-amd.yml
     PIGLIT_REPLAY_DEVICE_NAME: "vk-${GPU_VERSION}"
     PIGLIT_REPLAY_EXTRA_ARGS: --keep-image --minio_bucket=${S3_TRACIE_PRIVATE_BUCKET} --jwt-file=${S3_JWT_FILE}