diff options
| author | Andres Gomez <agomez@igalia.com> | 2021-01-16 02:46:54 +0200 |
|---|---|---|
| committer | Dylan Baker <dylan.c.baker@intel.com> | 2021-01-21 14:53:47 -0800 |
| commit | 20c0159608abe61ffb865da6d3247858f7bbb213 (patch) | |
| tree | 5e690bf82ad114453f06d6e8b61fba6fbd0bf9ed | |
| parent | fb30e941fe7d84b10eb36c2b73434c8b866befc3 (diff) | |
ci: correct the trace image URLs in the piglit summary
Fixes: 09429fa85b6 ("ci: add piglit replay jobs and remove tracie ones")
Signed-off-by: Andres Gomez <agomez@igalia.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/8531>
(cherry picked from commit 0773cd33c2bd14605eee471dd0dcc5306dd41cd4)
| -rw-r--r-- | .gitlab-ci.yml | 2 | ||||
| -rwxr-xr-x | .gitlab-ci/piglit/run.sh | 4 | ||||
| -rw-r--r-- | .pick_status.json | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e3c5c7411b2..a1b5b124b6d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1038,7 +1038,7 @@ meson-mingw32-x86_64: PIGLIT_PROFILES: replay PIGLIT_REPLAY_UPLOAD_TO_MINIO: 1 PIGLIT_REPLAY_EXTRA_ARGS: --keep-image --db-path ${CI_PROJECT_DIR}/replayer-db/ - PIGLIT_REPLAY_REFERENCE_IMAGES_BASE_URL: "/mesa-tracie-results/$CI_PROJECT_PATH" + PIGLIT_REPLAY_REFERENCE_IMAGES_BASE_URL: "/mesa-tracie-results/$FDO_UPSTREAM_REPO" PIGLIT_REPLAY_ARTIFACTS_BASE_URL: "/artifacts/$CI_PROJECT_PATH/$CI_PIPELINE_ID/$CI_JOB_ID" PIGLIT_HTML_SUMMARY: 0 PIGLIT_JUNIT_RESULTS: 1 diff --git a/.gitlab-ci/piglit/run.sh b/.gitlab-ci/piglit/run.sh index e320541a485..d59c3833c47 100755 --- a/.gitlab-ci/piglit/run.sh +++ b/.gitlab-ci/piglit/run.sh @@ -202,9 +202,9 @@ if [ ${PIGLIT_HTML_SUMMARY:-1} -eq 1 ]; then if [ "x$PIGLIT_PROFILES" = "xreplay" ]; then find "$OLDPWD"/summary -type f -name "*.html" -print0 \ - | xargs -0 sed -i 's@<img src="file://'"${RESULTS}"'@<img src="https://'"${MINIO_HOST}${PIGLIT_REPLAY_ARTIFACTS_BASE_URL}"'@g' + | xargs -0 sed -i 's%<img src="file://'"${RESULTS}"'.*-\([0-9a-f]*\)\.png%<img src="https://'"${MINIO_HOST}${PIGLIT_REPLAY_ARTIFACTS_BASE_URL}"'/traces/\1.png%g' find "$OLDPWD"/summary -type f -name "*.html" -print0 \ - | xargs -0 sed -i 's@<img src="file://@<img src="https://'"${MINIO_HOST}${PIGLIT_REPLAY_REFERENCE_IMAGES_BASE_URL}"'/@g' + | xargs -0 sed -i 's%<img src="file://%<img src="https://'"${MINIO_HOST}${PIGLIT_REPLAY_REFERENCE_IMAGES_BASE_URL}"'/%g' fi fi diff --git a/.pick_status.json b/.pick_status.json index a0cbd45c4b1..9f831661b14 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -211,7 +211,7 @@ "description": "ci: correct the trace image URLs in the piglit summary", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "master_sha": null, "because_sha": "09429fa85b68ca0cdf8c8ac320560b2936249bd6" }, |