Bug 1917740 - Improve reference script update for Snap QA tests r=ben…

…chatt

Differential Revision: https://phabricator.services.mozilla.com/D223271

taskcluster/docker/snap-coreXX-build/run.sh

@@ -117,7 +117,8 @@ else
   # index.gecko.v2.mozilla-central.revision.bf0897ec442e625c185407cc615a6adc0e40fa75.firefox.amd64-nightly
   #  => https://firefox-ci-tc.services.mozilla.com/api/index/v1/task/gecko.v2.mozilla-central.revision.bf0897ec442e625c185407cc615a6adc0e40fa75.firefox.amd64-nightly/artifacts/public%2Fbuild%2Ffirefox.snap
 
-  INDEX_NAME="${BRANCH}"
+  # Remove "-" so we get e.g., esr128 from esr-128
+  INDEX_NAME=${BRANCH//-/}
   if [ "${INDEX_NAME}" = "try" ]; then
     INDEX_NAME=nightly
   fi;

taskcluster/docker/snap-coreXX-build/snap-tests/update-references.sh

@@ -2,6 +2,7 @@
 
 TASK_ID=${1}
 THIS="$(dirname "$0")"
+THERE=${2}
 
 if [ -z "${TASK_ID}" ]; then
     echo "Please provide a task ID"
@@ -16,6 +17,10 @@ do
     name="$(basename "${reference}")"
     final_name=${name//new_/}
     target_name=$(find "${THIS}" -type f -name "${final_name}")
+    if [ -n "${THERE}" ]; then
+        # shellcheck disable=SC2001
+        target_name=$(echo "${target_name}" | sed -e "s/\.png$/-${THERE}.png/g")
+    fi
     url="${TASKCLUSTER_API_ROOT}/api/queue/v1/task/${TASK_ID}/artifacts/${reference}"
     echo "$url => $target_name"
     curl -SL "${url}" -o "${target_name}"