From 0773cd33c2bd14605eee471dd0dcc5306dd41cd4 Mon Sep 17 00:00:00 2001 From: Andres Gomez Date: Sat, 16 Jan 2021 02:46:54 +0200 Subject: [PATCH] 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 Reviewed-by: Eric Anholt Part-of: --- .gitlab-ci.yml | 2 +- .gitlab-ci/piglit/run.sh | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 25d758053eb..fb0f2f321ae 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@