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: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/36955>
This commit is contained in:
Eric Engestrom 2025-07-31 08:58:47 +02:00 committed by Marge Bot
parent b4e49664f4
commit fa74e939bf
9 changed files with 11 additions and 8 deletions

View file

@ -31,6 +31,10 @@ else
export PIGLIT_REPLAY_EXTRA_ARGS="--keep-image ${PIGLIT_REPLAY_EXTRA_ARGS}" export PIGLIT_REPLAY_EXTRA_ARGS="--keep-image ${PIGLIT_REPLAY_EXTRA_ARGS}"
fi 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. # Set up the environment.
# Modifiying here directly LD_LIBRARY_PATH may cause problems when # Modifiying here directly LD_LIBRARY_PATH may cause problems when
# using a command wrapper. Hence, we will just set it when running the # using a command wrapper. Hence, we will just set it when running the

View file

@ -1,7 +1,7 @@
%YAML 1.2 %YAML 1.2
--- ---
traces-db: 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: traces:
unigine/heaven-scene1-low-d3d11.trace-dxgi: unigine/heaven-scene1-low-d3d11.trace-dxgi:

View file

@ -1,7 +1,7 @@
%YAML 1.2 %YAML 1.2
--- ---
traces-db: 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: traces:
stellaris/Stellaris-trim--f722-v20201203-v2.trace: stellaris/Stellaris-trim--f722-v20201203-v2.trace:

View file

@ -1,7 +1,7 @@
%YAML 1.2 %YAML 1.2
--- ---
traces-db: 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: |- text: |-
NOTE for faster runtime, try to sort tests so the longer running traces NOTE for faster runtime, try to sort tests so the longer running traces

View file

@ -11,7 +11,6 @@ include:
VISIBILITY_GROUP: "mesa-ci" VISIBILITY_GROUP: "mesa-ci"
EGL_PLATFORM: "surfaceless" EGL_PLATFORM: "surfaceless"
PIGLIT_TRACES_FILE: traces-vmware.yml 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_REPLAY_DEVICE_NAME: "gl-vmware-llvmpipe"
PIGLIT_RESULTS: "llvmpipe-replay" PIGLIT_RESULTS: "llvmpipe-replay"
FARM: vmware FARM: vmware

View file

@ -1,7 +1,7 @@
%YAML 1.2 %YAML 1.2
--- ---
traces-db: 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: traces:
AmnesiaTDD/Amnesia-f700-v2.trace: AmnesiaTDD/Amnesia-f700-v2.trace:

View file

@ -1,7 +1,7 @@
%YAML 1.2 %YAML 1.2
--- ---
traces-db: 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: traces:
0ad/0ad-v2.trace: 0ad/0ad-v2.trace:

View file

@ -1,7 +1,7 @@
%YAML 1.2 %YAML 1.2
--- ---
traces-db: 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: traces:
behdad-glyphy/glyphy-v2.trace: behdad-glyphy/glyphy-v2.trace:

View file

@ -1,7 +1,7 @@
%YAML 1.2 %YAML 1.2
--- ---
traces-db: 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: traces:
behdad-glyphy/glyphy-v2.trace: behdad-glyphy/glyphy-v2.trace: