From 60f7bd3c095c96140fb03b20481642af75d5d6b6 Mon Sep 17 00:00:00 2001
From: Emma Anholt <emma@anholt.net>
Date: Wed, 12 Jan 2022 11:24:44 -0800
Subject: [PATCH] ci/traces: Drop PIGLIT_REPLAY_UPLOAD_TO_MINIO.

You have to do this as part of the traces workflow, otherwise there are no
baseline images for your driver to compare to in the HTML summary.

Reviewed-by: Cristian Ciocaltea <cristian.ciocaltea@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/14604>
---
 .gitlab-ci.yml                     |  1 -
 .gitlab-ci/common/generate-env.sh  |  1 -
 .gitlab-ci/lava/lava-submit.sh     |  3 ---
 .gitlab-ci/piglit/piglit-traces.sh | 18 +++++++-----------
 4 files changed, 7 insertions(+), 16 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index eca30cae478..e902d71c64b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1288,7 +1288,6 @@ debian-mingw32-x86_64:
       - results/*.txt
   variables:
     CI_JOB_JWT_FILE: /minio_jwt  # JWT file on piglit jobs should be available on / partition
-    PIGLIT_REPLAY_UPLOAD_TO_MINIO: 1
     PIGLIT_REPLAY_EXTRA_ARGS:  --keep-image --db-path ${CI_PROJECT_DIR}/replayer-db/ --minio_host=minio-packet.freedesktop.org --minio_bucket=mesa-tracie-public --role-session-name=${CI_PROJECT_PATH}:${CI_JOB_ID} --jwt-file=${CI_JOB_JWT_FILE}
     PIGLIT_JUNIT_RESULTS: 1
     CI_JOB_JWT_FILE: /minio_jwt  # JWT file on piglit jobs should be available on / partition
diff --git a/.gitlab-ci/common/generate-env.sh b/.gitlab-ci/common/generate-env.sh
index 232d54c420c..0ac02f852b7 100755
--- a/.gitlab-ci/common/generate-env.sh
+++ b/.gitlab-ci/common/generate-env.sh
@@ -83,7 +83,6 @@ for var in \
     PIGLIT_REPLAY_EXTRA_ARGS \
     PIGLIT_REPLAY_REFERENCE_IMAGES_BASE \
     PIGLIT_REPLAY_SUBCOMMAND \
-    PIGLIT_REPLAY_UPLOAD_TO_MINIO \
     PIGLIT_RESULTS \
     PIGLIT_TESTS \
     PIPELINE_ARTIFACTS_BASE \
diff --git a/.gitlab-ci/lava/lava-submit.sh b/.gitlab-ci/lava/lava-submit.sh
index 59325678dab..5b4e0d782b2 100755
--- a/.gitlab-ci/lava/lava-submit.sh
+++ b/.gitlab-ci/lava/lava-submit.sh
@@ -14,9 +14,6 @@ fi
 rm -rf results
 mkdir -p results/job-rootfs-overlay/
 
-# LAVA always uploads to MinIO when necessary as we don't have direct upload
-# from the DUT
-export PIGLIT_REPLAY_UPLOAD_TO_MINIO=1
 cp artifacts/ci-common/capture-devcoredump.sh results/job-rootfs-overlay/
 cp artifacts/ci-common/init-*.sh results/job-rootfs-overlay/
 artifacts/ci-common/generate-env.sh > results/job-rootfs-overlay/set-job-env-vars.sh
diff --git a/.gitlab-ci/piglit/piglit-traces.sh b/.gitlab-ci/piglit/piglit-traces.sh
index 68703be4704..13dcf0efea2 100755
--- a/.gitlab-ci/piglit/piglit-traces.sh
+++ b/.gitlab-ci/piglit/piglit-traces.sh
@@ -186,9 +186,7 @@ if [ "$RUN_CMD_WRAPPER" ]; then
     RUN_CMD="set +e; $RUN_CMD_WRAPPER "$(/usr/bin/printf "%q" "$RUN_CMD")"; set -e"
 fi
 
-if [ ${PIGLIT_REPLAY_UPLOAD_TO_MINIO:-0} -eq 1 ]; then
-    ci-fairy minio login $MINIO_ARGS --token-file "${CI_JOB_JWT_FILE}"
-fi
+ci-fairy minio login $MINIO_ARGS --token-file "${CI_JOB_JWT_FILE}"
 
 eval $RUN_CMD
 
@@ -211,17 +209,15 @@ mkdir -p .gitlab-ci/piglit
     | sed '/^summary:/Q' \
     > $RESULTSFILE
 
-if [ ${PIGLIT_REPLAY_UPLOAD_TO_MINIO:-0} -eq 1 ]; then
+__PREFIX="trace/$PIGLIT_REPLAY_DEVICE_NAME"
+__MINIO_PATH="$PIGLIT_REPLAY_ARTIFACTS_BASE_URL"
+__MINIO_TRACES_PREFIX="traces"
 
-    __PREFIX="trace/$PIGLIT_REPLAY_DEVICE_NAME"
-    __MINIO_PATH="$PIGLIT_REPLAY_ARTIFACTS_BASE_URL"
-    __MINIO_TRACES_PREFIX="traces"
-
-    if [ "x$PIGLIT_REPLAY_SUBCOMMAND" != "xprofile" ]; then
-        quiet replay_minio_upload_images
-    fi
+if [ "x$PIGLIT_REPLAY_SUBCOMMAND" != "xprofile" ]; then
+    quiet replay_minio_upload_images
 fi
 
+
 if [ ! -s $RESULTSFILE ]; then
     exit 0
 fi