commit 5fee8f473ca7872965a62c894a70d1e0e8dc1604
author liuyq <yongqin.liu@linaro.org> Wed Apr 16 19:51:27 2025 +0800
committer GitHub <noreply@github.com> Wed Apr 16 12:51:27 2025 +0100
tree 1dea70afd61c06a8648920b4675c1c9dca55ee24
parent 6684fb5d0dd9b875db8bf77ceffef116081f56fe

noninteractive-tradefed: using HTTP_CACHE to get kisscache url (#560)

After the following lava change:
    https://gitlab.com/lava/lava/-/merge_requests/2734
the kisscache url is exported by LAVA via the HTTP_CACHE variable,
it's better to check and use the varible in the scripts as well,
to avoid being passed from the LAVA job definition.

Signed-off-by: Yongqin Liu <yongqin.liu@linaro.org>

automated/android/noninteractive-tradefed/tradefed.sh

diff --git a/automated/android/noninteractive-tradefed/tradefed.sh b/automated/android/noninteractive-tradefed/tradefed.sh
index 4e5804f..f7689af 100755
--- a/automated/android/noninteractive-tradefed/tradefed.sh
+++ b/automated/android/noninteractive-tradefed/tradefed.sh
@@ -123,7 +123,18 @@
 if echo "${TEST_URL}" | grep "^http://lkft-cache.lkftlab/" ; then
     NO_PROXY=.lkftlab wget -S --progress=dot:giga "${TEST_URL}" -O "${file_name}"
 elif echo "${TEST_URL}" | grep "^http" ; then
-    wget -S --progress=dot:giga "${TEST_URL}" -O "${file_name}"
+    # using kisscache to download the file, based on the following change:
+    #    https://gitlab.com/lava/lava/-/merge_requests/2734
+    # shellcheck disable=SC2153
+    if [ -n "${HTTP_CACHE}" ]; then
+        # and it's in the format like this:
+        #     https://cache.lavasoftware.org/api/v1/fetch/?url=%s
+        # so need to remove "%s" first here
+        http_cache=$(echo "${HTTP_CACHE}"|sed 's|%s||')
+        wget -S --progress=dot:giga "${http_cache}${TEST_URL}" -O "${file_name}"
+    else
+        wget -S --progress=dot:giga "${TEST_URL}" -O "${file_name}"
+    fi
 else
     cp "${TEST_URL}" "./${file_name}"
 fi