Merge "Warn of unreleased docker images in manifest"

1 files changed, 13 insertions, 3 deletions

diff --git a/version-manifest/src/main/scripts/check-docker-manifest.sh b/version-manifest/src/main/scripts/check-docker-manifest.sh
index 61eb5a2a9..26e63b82d 100755
--- a/version-manifest/src/main/scripts/check-docker-manifest.sh
+++ b/version-manifest/src/main/scripts/check-docker-manifest.sh
@@ -10,18 +10,28 @@ if [ -z "$WORKSPACE" ]; then
     export WORKSPACE=`git rev-parse --show-toplevel`
 fi
 
-NEXUS_PREFIX="https://nexus3.onap.org/repository/docker.public/v2"
+NEXUS_PUBLIC_PREFIX="https://nexus3.onap.org/repository/docker.public/v2"
+NEXUS_RELEASE_PREFIX="https://nexus3.onap.org/repository/docker.release/v2"
 
 err=0
 for line in $(tail -n +2 $1); do
     image=$(echo $line | cut -d , -f 1)
     tag=$(echo $line | cut -d , -f 2)
-    tags=$(curl -s $NEXUS_PREFIX/$image/tags/list | jq -r '.tags[]')
+
+    tags=$(curl -s $NEXUS_PUBLIC_PREFIX/$image/tags/list | jq -r '.tags[]' 2> /dev/null)
     echo "$tags" | grep -q "^$tag\$"
     if [ $? -ne 0 ]; then
         echo "[ERROR] $image:$tag not found"
-        echo "$tags" | sed 's/^/  /'
+        #echo "$tags" | sed 's/^/  /'
         (( err++ ))
+
+    else
+        tags=$(curl -s $NEXUS_RELEASE_PREFIX/$image/tags/list | jq -r '.tags[]' 2> /dev/null)
+        echo "$tags" | grep -q "^$tag\$"
+        if [ $? -ne 0 ]; then
+            echo "[WARN] $image:$tag not released"
+            #echo "$tags" | sed 's/^/  /'
+        fi
     fi
 done
 exit $err