diff options
| author | Daniel Stone <daniels@collabora.com> | 2021-06-10 16:35:03 +0100 |
|---|---|---|
| committer | Marge Bot <eric+marge@anholt.net> | 2021-06-11 12:13:00 +0000 |
| commit | 0cccf004361bb0a2a2ea8e6a02a8631b0e50e386 (patch) | |
| tree | b6f225754cad53ce3ae1c8d8b852aab1101e6d5b /.gitlab-ci/piglit | |
| parent | d5d3dd7d97b04d6f7d613ba694e975188fbb753c (diff) | |
| download | mesa-0cccf004361bb0a2a2ea8e6a02a8631b0e50e386.tar.gz | |
ci: Use JOB_ARTIFACTS_BASE for Piglit fails
It's not Piglit-specific per se, it's just another per-job artifact
upload which needs to be made visible through MinIO.
Signed-off-by: Daniel Stone <daniels@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/11309>
Diffstat (limited to '.gitlab-ci/piglit')
| -rwxr-xr-x | .gitlab-ci/piglit/run.sh | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/.gitlab-ci/piglit/run.sh b/.gitlab-ci/piglit/run.sh index 886e237431d..ff0972dd162 100755 --- a/.gitlab-ci/piglit/run.sh +++ b/.gitlab-ci/piglit/run.sh @@ -152,13 +152,13 @@ replay_minio_upload_images() { if [ "x$CI_PROJECT_PATH" != "x$FDO_UPSTREAM_REPO" ]; then continue fi - __MINIO_PATH="$PIGLIT_REPLAY_REFERENCE_IMAGES_BASE_URL" + __MINIO_PATH="$PIGLIT_REPLAY_REFERENCE_IMAGES_BASE" __DESTINATION_FILE_PATH="${line##*-}" - if wget -q --method=HEAD "${MINIO_HOST}${__MINIO_PATH}/${__DESTINATION_FILE_PATH}" 2>/dev/null; then + if wget -q --method=HEAD "https://${__MINIO_PATH}/${__DESTINATION_FILE_PATH}" 2>/dev/null; then continue fi else - __MINIO_PATH="$PIGLIT_REPLAY_ARTIFACTS_BASE_URL" + __MINIO_PATH="$JOB_ARTIFACTS_BASE" __DESTINATION_FILE_PATH="$__MINIO_TRACES_PREFIX/${line##*-}" # Adding to the JUnit the direct link to the diff page in # the dashboard @@ -175,7 +175,7 @@ replay_minio_upload_images() { fi ci-fairy minio cp $MINIO_ARGS "$RESULTS/$__PREFIX/$line" \ - "minio://${MINIO_HOST}${__MINIO_PATH}/${__DESTINATION_FILE_PATH}" + "minio://${__MINIO_PATH}/${__DESTINATION_FILE_PATH}" done } |