diff options
| author | Emma Anholt <emma@anholt.net> | 2022-01-12 11:24:44 -0800 |
|---|---|---|
| committer | Marge Bot <emma+marge@anholt.net> | 2022-01-27 04:37:16 +0000 |
| commit | 60f7bd3c095c96140fb03b20481642af75d5d6b6 (patch) | |
| tree | 96ea93254585aa95926802cea0e7e6e03438bc8a /.gitlab-ci/piglit | |
| parent | d0af517a14ce45a98e4a86c3a5b0e59a3054d46b (diff) | |
| download | mesa-60f7bd3c095c96140fb03b20481642af75d5d6b6.tar.gz | |
ci/traces: Drop PIGLIT_REPLAY_UPLOAD_TO_MINIO.
You have to do this as part of the traces workflow, otherwise there are no
baseline images for your driver to compare to in the HTML summary.
Reviewed-by: Cristian Ciocaltea <cristian.ciocaltea@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/14604>
Diffstat (limited to '.gitlab-ci/piglit')
| -rwxr-xr-x | .gitlab-ci/piglit/piglit-traces.sh | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/.gitlab-ci/piglit/piglit-traces.sh b/.gitlab-ci/piglit/piglit-traces.sh index 68703be4704..13dcf0efea2 100755 --- a/.gitlab-ci/piglit/piglit-traces.sh +++ b/.gitlab-ci/piglit/piglit-traces.sh @@ -186,9 +186,7 @@ if [ "$RUN_CMD_WRAPPER" ]; then RUN_CMD="set +e; $RUN_CMD_WRAPPER "$(/usr/bin/printf "%q" "$RUN_CMD")"; set -e" fi -if [ ${PIGLIT_REPLAY_UPLOAD_TO_MINIO:-0} -eq 1 ]; then - ci-fairy minio login $MINIO_ARGS --token-file "${CI_JOB_JWT_FILE}" -fi +ci-fairy minio login $MINIO_ARGS --token-file "${CI_JOB_JWT_FILE}" eval $RUN_CMD @@ -211,17 +209,15 @@ mkdir -p .gitlab-ci/piglit | sed '/^summary:/Q' \ > $RESULTSFILE -if [ ${PIGLIT_REPLAY_UPLOAD_TO_MINIO:-0} -eq 1 ]; then - - __PREFIX="trace/$PIGLIT_REPLAY_DEVICE_NAME" - __MINIO_PATH="$PIGLIT_REPLAY_ARTIFACTS_BASE_URL" - __MINIO_TRACES_PREFIX="traces" +__PREFIX="trace/$PIGLIT_REPLAY_DEVICE_NAME" +__MINIO_PATH="$PIGLIT_REPLAY_ARTIFACTS_BASE_URL" +__MINIO_TRACES_PREFIX="traces" - if [ "x$PIGLIT_REPLAY_SUBCOMMAND" != "xprofile" ]; then - quiet replay_minio_upload_images - fi +if [ "x$PIGLIT_REPLAY_SUBCOMMAND" != "xprofile" ]; then + quiet replay_minio_upload_images fi + if [ ! -s $RESULTSFILE ]; then exit 0 fi |