ci/traces: keep images for every job except the performance testing

Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/8354

Acked-by: Emma Anholt <emma@anholt.net>
Signed-off-by: David Heidelberg <david.heidelberg@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/25606>
This commit is contained in:
David Heidelberg
2023-10-08 22:34:32 +02:00
committed by Marge Bot
parent 82cfed9758
commit 5ab60581da
9 changed files with 7 additions and 8 deletions

View File

@@ -16,6 +16,9 @@ mkdir -p "$RESULTS"
if [ "$PIGLIT_REPLAY_SUBCOMMAND" = "profile" ]; then
yq -iY 'del(.traces[][] | select(.label[]? == "no-perf"))' \
"$PIGLIT_REPLAY_DESCRIPTION_FILE"
else
# keep the images for the later upload
PIGLIT_REPLAY_EXTRA_ARGS="--keep-image ${PIGLIT_REPLAY_EXTRA_ARGS}"
fi
# WINE

View File

@@ -143,7 +143,7 @@ clang-format:
exclude:
- results/*.shader_cache
variables:
PIGLIT_REPLAY_EXTRA_ARGS: --keep-image --db-path ${CI_PROJECT_DIR}/replayer-db/ --minio_bucket=mesa-tracie-public --jwt-file=${CI_JOB_JWT_FILE}
PIGLIT_REPLAY_EXTRA_ARGS: --db-path ${CI_PROJECT_DIR}/replayer-db/ --minio_bucket=mesa-tracie-public --jwt-file=${CI_JOB_JWT_FILE}
# until we overcome Infrastructure issues, give traces extra 5 min before timeout
DEVICE_HANGING_TIMEOUT_SEC: 600
script:

View File

@@ -179,7 +179,6 @@
variables:
PIGLIT_PLATFORM: mixed_glx_egl # TODO, take wine/VK in account
PIGLIT_REPLAY_DESCRIPTION_FILE: "/install/traces-amd.yml"
PIGLIT_REPLAY_EXTRA_ARGS: --keep-image
############### Valve Infra
.test-radv:

View File

@@ -46,7 +46,6 @@ radeonsi-stoney-traces:x86_64:
variables:
EGL_PLATFORM: surfaceless
PIGLIT_REPLAY_DESCRIPTION_FILE: "/install/traces-amd.yml"
PIGLIT_REPLAY_EXTRA_ARGS: --keep-image
radv-raven-vkcts:x86_64:
extends:

View File

@@ -279,7 +279,7 @@ a630-traces-restricted:
- .google-freedreno-rules-restricted
variables:
PIGLIT_REPLAY_DESCRIPTION_FILE: "/install/restricted-traces-freedreno.yml"
PIGLIT_REPLAY_EXTRA_ARGS: "--download-caching-proxy-url=http://10.42.0.1:8888/cache/?uri= --keep-image --db-path ${CI_PROJECT_DIR}/replayer-db/ --minio_bucket=mesa-tracie-private --jwt-file=${CI_JOB_JWT_FILE}"
PIGLIT_REPLAY_EXTRA_ARGS: "--download-caching-proxy-url=http://10.42.0.1:8888/cache/?uri= --db-path ${CI_PROJECT_DIR}/replayer-db/ --minio_bucket=mesa-tracie-private --jwt-file=${CI_JOB_JWT_FILE}"
allow_failure: true
a630-traces-performance:

View File

@@ -55,7 +55,7 @@ virgl-traces:
- .virgl-iris-test
- .virgl-iris-manual-rules
variables:
PIGLIT_REPLAY_EXTRA_ARGS: "--keep-image --download-caching-proxy-url=${FDO_HTTP_CACHE_URI}"
PIGLIT_REPLAY_EXTRA_ARGS: "--download-caching-proxy-url=${FDO_HTTP_CACHE_URI}"
virgl-iris-traces-performance:
extends:

View File

@@ -60,7 +60,7 @@ zink-anv-tgl-traces-restricted:
- .zink-anv-rules-restricted
variables:
PIGLIT_REPLAY_DESCRIPTION_FILE: "/install/traces-zink-restricted.yml"
PIGLIT_REPLAY_EXTRA_ARGS: --keep-image --db-path ${CI_PROJECT_DIR}/replayer-db/ --minio_bucket=mesa-tracie-private --jwt-file=${CI_JOB_JWT_FILE}
PIGLIT_REPLAY_EXTRA_ARGS: --db-path ${CI_PROJECT_DIR}/replayer-db/ --minio_bucket=mesa-tracie-private --jwt-file=${CI_JOB_JWT_FILE}
allow_failure: true
zink-tu-a618:

View File

@@ -270,7 +270,6 @@
PIGLIT_REPLAY_DEVICE_NAME: "gl-${GPU_VERSION}"
PIGLIT_RESULTS: "${GPU_VERSION}-${PIGLIT_PROFILES}"
PIGLIT_REPLAY_DESCRIPTION_FILE: "/install/traces-iris.yml"
PIGLIT_REPLAY_EXTRA_ARGS: --keep-image
.iris-whl-traces:
variables:

View File

@@ -86,7 +86,6 @@
MESA_GLSL_VERSION_OVERRIDE: 330
EGL_PLATFORM: surfaceless
PIGLIT_REPLAY_DESCRIPTION_FILE: "/install/traces-panfrost.yml"
PIGLIT_REPLAY_EXTRA_ARGS: --keep-image
# 2 machines, but shared with KernelCI (2022-10-24)
.lava-rk3288-veyron-jaq: