From 3ce27c08b4b1a204f47eae739196095382c31f99 Mon Sep 17 00:00:00 2001 From: Eric Engestrom Date: Mon, 7 Jul 2025 17:02:44 +0200 Subject: [PATCH] piglit/ci: configure ci-tron to download traces and upload renders Part-of: --- .gitlab-ci/piglit/piglit-traces.sh | 2 ++ .gitlab-ci/test/gitlab-ci-inc.yml | 7 +++++++ 2 files changed, 9 insertions(+) diff --git a/.gitlab-ci/piglit/piglit-traces.sh b/.gitlab-ci/piglit/piglit-traces.sh index e72d242b746..846427a4b20 100755 --- a/.gitlab-ci/piglit/piglit-traces.sh +++ b/.gitlab-ci/piglit/piglit-traces.sh @@ -33,6 +33,8 @@ fi if [ -n "${LAVA_HTTP_CACHE_URI:-}" ]; then export PIGLIT_REPLAY_EXTRA_ARGS="--download-caching-proxy-url=${LAVA_HTTP_CACHE_URI} ${PIGLIT_REPLAY_EXTRA_ARGS}" +elif [ -n "${CI_TRON_JOB_HTTP_SERVER:-}" ]; then + export PIGLIT_REPLAY_EXTRA_ARGS="--download-caching-proxy-url=${CI_TRON_JOB_HTTP_SERVER}/caching_proxy/ ${PIGLIT_REPLAY_EXTRA_ARGS}" elif [ -n "${FDO_HTTP_CACHE_URI:-}" ]; then # FIXME: remove when there is no baremetal traces job anymore. export PIGLIT_REPLAY_EXTRA_ARGS="--download-caching-proxy-url=${FDO_HTTP_CACHE_URI} ${PIGLIT_REPLAY_EXTRA_ARGS}" diff --git a/.gitlab-ci/test/gitlab-ci-inc.yml b/.gitlab-ci/test/gitlab-ci-inc.yml index 5bd582d52ec..26b5ca1188a 100644 --- a/.gitlab-ci/test/gitlab-ci-inc.yml +++ b/.gitlab-ci/test/gitlab-ci-inc.yml @@ -143,6 +143,13 @@ PIGLIT_RESULTS: "${GPU_VERSION}-replay" PIGLIT_NO_WINDOW: 1 HWCI_TEST_SCRIPT: "install/piglit/piglit-traces.sh" + # For downloading traces: + CI_TRON_HTTP_ARTIFACT__TRACIE_PUBLIC__PATH: /caching_proxy/https://s3.freedesktop.org/mesa-tracie-public/(.*) + CI_TRON_HTTP_ARTIFACT__TRACIE_PUBLIC__URL: https://s3.freedesktop.org/mesa-tracie-public/\1 + # For uploading renders: + # s3.fd.o redirects to hetzner, so we need that too + CI_TRON_PROXY__ALLOWED_ENDPOINTS_CATEGORY__S3__FDO: s3.freedesktop.org:443 + CI_TRON_PROXY__ALLOWED_ENDPOINTS_CATEGORY__S3__BACKEND: fsn1.your-objectstorage.com:443 .deqp-test: script: