From fa74e939bfdc6a9edebac1e76bd88aef5700edf7 Mon Sep 17 00:00:00 2001 From: Eric Engestrom Date: Thu, 31 Jul 2025 08:58:47 +0200 Subject: [PATCH] ci/piglit: automatically use LAVA proxy This avoids having to hardcode the proxy in the traces `download-url` or jobs setting `PIGLIT_REPLAY_EXTRA_ARGS` and accidentally overriding the default args when the author meant to append. Part-of: --- .gitlab-ci/piglit/piglit-traces.sh | 4 ++++ src/amd/ci/traces-amd.yml | 2 +- src/freedreno/ci/restricted-traces-freedreno.yml | 2 +- src/freedreno/ci/traces-freedreno.yml | 2 +- src/gallium/drivers/svga/ci/gitlab-ci.yml | 1 - src/gallium/drivers/zink/ci/traces-zink-restricted.yml | 2 +- src/gallium/drivers/zink/ci/traces-zink.yml | 2 +- src/intel/ci/traces-iris.yml | 2 +- src/panfrost/ci/traces-panfrost.yml | 2 +- 9 files changed, 11 insertions(+), 8 deletions(-) diff --git a/.gitlab-ci/piglit/piglit-traces.sh b/.gitlab-ci/piglit/piglit-traces.sh index 3cd885acf9d..9f45ebb23e5 100755 --- a/.gitlab-ci/piglit/piglit-traces.sh +++ b/.gitlab-ci/piglit/piglit-traces.sh @@ -31,6 +31,10 @@ else export PIGLIT_REPLAY_EXTRA_ARGS="--keep-image ${PIGLIT_REPLAY_EXTRA_ARGS}" 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}" +fi + # Set up the environment. # Modifiying here directly LD_LIBRARY_PATH may cause problems when # using a command wrapper. Hence, we will just set it when running the diff --git a/src/amd/ci/traces-amd.yml b/src/amd/ci/traces-amd.yml index bb8d64dc0f2..8a41ed3e6f8 100644 --- a/src/amd/ci/traces-amd.yml +++ b/src/amd/ci/traces-amd.yml @@ -1,7 +1,7 @@ %YAML 1.2 --- traces-db: - download-url: "http://caching-proxy/cache/?uri=https://s3.freedesktop.org/mesa-tracie-public/" + download-url: "https://s3.freedesktop.org/mesa-tracie-public/" traces: unigine/heaven-scene1-low-d3d11.trace-dxgi: diff --git a/src/freedreno/ci/restricted-traces-freedreno.yml b/src/freedreno/ci/restricted-traces-freedreno.yml index a84663c2b6c..c1d45d03b94 100644 --- a/src/freedreno/ci/restricted-traces-freedreno.yml +++ b/src/freedreno/ci/restricted-traces-freedreno.yml @@ -1,7 +1,7 @@ %YAML 1.2 --- traces-db: - download-url: "http://10.42.0.1:8888/cache/?uri=https://s3.freedesktop.org/mesa-tracie-private/" + download-url: "https://s3.freedesktop.org/mesa-tracie-private/" traces: stellaris/Stellaris-trim--f722-v20201203-v2.trace: diff --git a/src/freedreno/ci/traces-freedreno.yml b/src/freedreno/ci/traces-freedreno.yml index faac72dec4e..e78c0c362f6 100644 --- a/src/freedreno/ci/traces-freedreno.yml +++ b/src/freedreno/ci/traces-freedreno.yml @@ -1,7 +1,7 @@ %YAML 1.2 --- traces-db: - download-url: "http://caching-proxy/cache/?uri=https://s3.freedesktop.org/mesa-tracie-public/" + download-url: "https://s3.freedesktop.org/mesa-tracie-public/" text: |- NOTE for faster runtime, try to sort tests so the longer running traces diff --git a/src/gallium/drivers/svga/ci/gitlab-ci.yml b/src/gallium/drivers/svga/ci/gitlab-ci.yml index ce33cdaee6b..65ff98adb9a 100644 --- a/src/gallium/drivers/svga/ci/gitlab-ci.yml +++ b/src/gallium/drivers/svga/ci/gitlab-ci.yml @@ -11,7 +11,6 @@ include: VISIBILITY_GROUP: "mesa-ci" EGL_PLATFORM: "surfaceless" PIGLIT_TRACES_FILE: traces-vmware.yml - PIGLIT_REPLAY_EXTRA_ARGS: "--download-caching-proxy-url=${LAVA_HTTP_CACHE_URI}" PIGLIT_REPLAY_DEVICE_NAME: "gl-vmware-llvmpipe" PIGLIT_RESULTS: "llvmpipe-replay" FARM: vmware diff --git a/src/gallium/drivers/zink/ci/traces-zink-restricted.yml b/src/gallium/drivers/zink/ci/traces-zink-restricted.yml index 545d7068c1f..bbf0701e486 100644 --- a/src/gallium/drivers/zink/ci/traces-zink-restricted.yml +++ b/src/gallium/drivers/zink/ci/traces-zink-restricted.yml @@ -1,7 +1,7 @@ %YAML 1.2 --- traces-db: - download-url: "http://caching-proxy/cache/?uri=https://s3.freedesktop.org/mesa-tracie-private/" + download-url: "https://s3.freedesktop.org/mesa-tracie-private/" traces: AmnesiaTDD/Amnesia-f700-v2.trace: diff --git a/src/gallium/drivers/zink/ci/traces-zink.yml b/src/gallium/drivers/zink/ci/traces-zink.yml index 795a6b47fa0..2d7b7dcc142 100644 --- a/src/gallium/drivers/zink/ci/traces-zink.yml +++ b/src/gallium/drivers/zink/ci/traces-zink.yml @@ -1,7 +1,7 @@ %YAML 1.2 --- traces-db: - download-url: "http://caching-proxy/cache/?uri=https://s3.freedesktop.org/mesa-tracie-public/" + download-url: "https://s3.freedesktop.org/mesa-tracie-public/" traces: 0ad/0ad-v2.trace: diff --git a/src/intel/ci/traces-iris.yml b/src/intel/ci/traces-iris.yml index 682a4eff73c..723c7043930 100644 --- a/src/intel/ci/traces-iris.yml +++ b/src/intel/ci/traces-iris.yml @@ -1,7 +1,7 @@ %YAML 1.2 --- traces-db: - download-url: "http://caching-proxy/cache/?uri=https://s3.freedesktop.org/mesa-tracie-public/" + download-url: "https://s3.freedesktop.org/mesa-tracie-public/" traces: behdad-glyphy/glyphy-v2.trace: diff --git a/src/panfrost/ci/traces-panfrost.yml b/src/panfrost/ci/traces-panfrost.yml index 1e5f9b1056a..c5ac85c0e2d 100644 --- a/src/panfrost/ci/traces-panfrost.yml +++ b/src/panfrost/ci/traces-panfrost.yml @@ -1,7 +1,7 @@ %YAML 1.2 --- traces-db: - download-url: "http://caching-proxy/cache/?uri=https://s3.freedesktop.org/mesa-tracie-public/" + download-url: "https://s3.freedesktop.org/mesa-tracie-public/" traces: behdad-glyphy/glyphy-v2.trace: