From d91403af3aa9b88645490f22537f0b5ea2b56ede Mon Sep 17 00:00:00 2001
From: kfox1111 <Kevin.Fox@pnnl.gov>
Date: Tue, 22 Aug 2023 12:05:44 -0700
Subject: [PATCH] Scan for updates to new images (#466)

Co-authored-by: Marco Franssen <marco.franssen@gmail.com>
---
 .github/scripts/update-tags.sh        |  9 ++++++---
 .github/tests/images.json             | 10 ++++++++++
 .github/workflows/check-versions.yaml |  2 +-
 3 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/.github/scripts/update-tags.sh b/.github/scripts/update-tags.sh
index 4ba69e5..7bba7d5 100755
--- a/.github/scripts/update-tags.sh
+++ b/.github/scripts/update-tags.sh
@@ -46,10 +46,13 @@ jq -r '. | keys[]' "$IMAGEJSON" | while read -r CHART; do
     REGISTRY=$(yq e ".${QUERY}.registry" "$VALUES")
     REPOSITORY=$(yq e ".${QUERY}.repository" "$VALUES")
     VERSION=$(yq e ".${QUERY}.tag" "$VALUES")
+    if [[ "$REGISTRY" != "" ]]; then
+      REGISTRY="$REGISTRY/"
+    fi
     if [[ "$FILTER" == "LATESTSHA" ]]; then
-      LATEST_VERSION="latest@"$(crane digest "${REGISTRY}/${REPOSITORY}:latest")
+      LATEST_VERSION="latest@"$(crane digest "${REGISTRY}${REPOSITORY}:latest")
     else
-      LATEST_VERSION=$(crane ls "${REGISTRY}/${REPOSITORY}" | grep "${FILTER}" | sort "${SORTFLAGS[@]}"| tail -n 1)
+      LATEST_VERSION=$(crane ls "${REGISTRY}${REPOSITORY}" | grep "${FILTER}" | sort "${SORTFLAGS[@]}" | tail -n 1)
     fi
 
     export QUERY
@@ -57,7 +60,7 @@ jq -r '. | keys[]' "$IMAGEJSON" | while read -r CHART; do
     export LATEST_VERSION
 
     if [ "${VERSION}" != "${LATEST_VERSION}" ]; then
-      echo "New image version found: ${REGISTRY}/${REPOSITORY}:${LATEST_VERSION}"
+      echo "New image version found: ${REGISTRY}${REPOSITORY}:${LATEST_VERSION}"
       "${SCRIPTPATH}/edit-yaml.py" > /tmp/$$
       mv /tmp/$$ "${VALUES}"
     fi
diff --git a/.github/tests/images.json b/.github/tests/images.json
index d33d64c..7ecacdb 100644
--- a/.github/tests/images.json
+++ b/.github/tests/images.json
@@ -39,6 +39,16 @@
       "query": "tests.bash.image",
       "filter": "LATESTSHA",
       "sort-flags": []
+    },
+    {
+      "query": "tests.toolkit.image",
+      "filter": "LATESTSHA",
+      "sort-flags": []
+    },
+    {
+      "query": "tests.busybox.image",
+      "filter": "^[0-9]\\+\\.[0-9]\\+\\.[0-9]\\+-uclibc$",
+      "sort-flags": ["-t", ".", "-k1,1n", "-k2,2n", "-k3,3n"]
     }
   ],
   "tornjak-frontend/values.yaml": [
diff --git a/.github/workflows/check-versions.yaml b/.github/workflows/check-versions.yaml
index f28d1b4..1722c47 100644
--- a/.github/workflows/check-versions.yaml
+++ b/.github/workflows/check-versions.yaml
@@ -47,7 +47,7 @@ jobs:
           go install github.com/mikefarah/yq/v4@latest
 
           sudo apt-get install wget apt-transport-https gnupg lsb-release
-          sudo pip install -r .github/scripts/requirements.txt
+          pip install -r .github/scripts/requirements.txt
 
           ./.github/scripts/update-tags.sh
           git diff