diff --git a/.gitlab-ci/piglit/run.sh b/.gitlab-ci/piglit/run.sh index d8cdb361bf4..e320541a485 100755 --- a/.gitlab-ci/piglit/run.sh +++ b/.gitlab-ci/piglit/run.sh @@ -154,8 +154,6 @@ if [ "x$PIGLIT_PROFILES" = "xreplay" ] \ __MINIO_PATH="$PIGLIT_REPLAY_ARTIFACTS_BASE_URL" __MINIO_TRACES_PREFIX="traces" - ci-fairy minio cp "$RESULTS"/junit.xml \ - "minio://${MINIO_HOST}${__MINIO_PATH}/${__MINIO_TRACES_PREFIX}/junit.xml" ci-fairy minio cp "$RESULTS"/results.json.bz2 \ "minio://${MINIO_HOST}${__MINIO_PATH}/${__MINIO_TRACES_PREFIX}/results.json.bz2" @@ -175,11 +173,21 @@ if [ "x$PIGLIT_PROFILES" = "xreplay" ] \ else __MINIO_PATH="$PIGLIT_REPLAY_ARTIFACTS_BASE_URL" __DESTINATION_FILE_PATH="$__MINIO_TRACES_PREFIX/${line##*-}" + # Adding to the JUnit the direct link to the diff page in + # the dashboard + __PIGLIT_TESTCASE_CLASSNAME="piglit\.trace\.$PIGLIT_REPLAY_DEVICE_NAME\.$(dirname $__TRACE | sed 's%/%\\.%g;s@%@\\%@')" + __PIGLIT_TESTCASE_NAME="$(basename $__TRACE | sed 's%\.%_%g;s@%@\\%@')" + __DASHBOARD_URL="https://tracie.freedesktop.org/dashboard/imagediff/${CI_PROJECT_PATH}/${CI_JOB_ID}/${__TRACE}" + sed '\%%{s%%To view the image differences visit: '"${__DASHBOARD_URL}"'%}' \ + -i "$RESULTS"/junit.xml fi ci-fairy minio cp "$RESULTS/$__PREFIX/$line" \ "minio://${MINIO_HOST}${__MINIO_PATH}/${__DESTINATION_FILE_PATH}" done + + ci-fairy minio cp "$RESULTS"/junit.xml \ + "minio://${MINIO_HOST}${__MINIO_PATH}/${__MINIO_TRACES_PREFIX}/junit.xml" fi cp "$INSTALL/piglit/$PIGLIT_RESULTS.txt" \ diff --git a/.pick_status.json b/.pick_status.json index 2402ba6e227..a0cbd45c4b1 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -220,7 +220,7 @@ "description": "ci: recover tracie dashboard URLs for failing traces", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "master_sha": null, "because_sha": "09429fa85b68ca0cdf8c8ac320560b2936249bd6" },