Mesa (master): ci/piglit: Include the updated piglit results list in the job results.

[GitLab Mirror]

Module: Mesa
Branch: master
Commit: cb5ee80ee801003e816574e6a4469368e63d8b47
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=cb5ee80ee801003e816574e6a4469368e63d8b47

Author: Eric Anholt <eric at anholt.net>
Date:   Fri Dec 11 10:40:57 2020 -0800

ci/piglit: Include the updated piglit results list in the job results.

If you're standing up a new piglit CI, you're going to want it.

Reviewed-by: Adam Jackson <ajax at redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/8068>

---

 .gitlab-ci.yml           | 1 +
 .gitlab-ci/piglit/run.sh | 9 ++++-----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 35300f2c5b1..f184fd14c03 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1013,6 +1013,7 @@ meson-mingw32-x86_64:
     name: "mesa_${CI_JOB_NAME}"
     paths:
       - summary/
+      - results/*.txt
   variables:
     PIGLIT_NO_WINDOW: 1
   script:
diff --git a/.gitlab-ci/piglit/run.sh b/.gitlab-ci/piglit/run.sh
index 46b8e54fbaf..86c49017715 100755
--- a/.gitlab-ci/piglit/run.sh
+++ b/.gitlab-ci/piglit/run.sh
@@ -137,10 +137,11 @@ if [ ${PIGLIT_JUNIT_RESULTS:-0} -eq 1 ]; then
 fi
 
 PIGLIT_RESULTS="${PIGLIT_RESULTS:-$PIGLIT_PROFILES}"
+RESULTSFILE="$RESULTS/$PIGLIT_RESULTS.txt"
 mkdir -p .gitlab-ci/piglit
 ./piglit summary console "$RESULTS"/results.json.bz2 \
     | tee ".gitlab-ci/piglit/$PIGLIT_RESULTS.txt.orig" \
-    | head -n -1 | grep -v ": pass" >".gitlab-ci/piglit/$PIGLIT_RESULTS.txt"
+    | head -n -1 | grep -v ": pass" > $RESULTSFILE
 
 if [ "x$PIGLIT_PROFILES" = "xreplay" ] \
        && [ ${PIGLIT_REPLAY_UPLOAD_TO_MINIO:-0} -eq 1 ]; then
@@ -181,8 +182,7 @@ fi
 
 cp "$INSTALL/piglit/$PIGLIT_RESULTS.txt" \
    ".gitlab-ci/piglit/$PIGLIT_RESULTS.txt.baseline"
-if diff -q ".gitlab-ci/piglit/$PIGLIT_RESULTS.txt.baseline" \
-        ".gitlab-ci/piglit/$PIGLIT_RESULTS.txt"; then
+if diff -q ".gitlab-ci/piglit/$PIGLIT_RESULTS.txt.baseline" $RESULTSFILE; then
     exit 0
 fi
 
@@ -199,6 +199,5 @@ if [ ${PIGLIT_HTML_SUMMARY:-1} -eq 1 ]; then
 fi
 
 printf "%s\n" "Unexpected change in results:"
-diff -u ".gitlab-ci/piglit/$PIGLIT_RESULTS.txt.baseline" \
-     ".gitlab-ci/piglit/$PIGLIT_RESULTS.txt"
+diff -u ".gitlab-ci/piglit/$PIGLIT_RESULTS.txt.baseline" $RESULTSFILE
 exit 1