Merge "Unit test instability fix"

[integration.git] / version-manifest / src / main / scripts / check-docker-manifest.sh

diff --git a/version-manifest/src/main/scripts/check-docker-manifest.sh b/version-manifest/src/main/scripts/check-docker-manifest.sh
index 61eb5a2..cff76ef 100755 (executable)
--- a/version-manifest/src/main/scripts/check-docker-manifest.sh
+++ b/version-manifest/src/main/scripts/check-docker-manifest.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 if [ "$#" -ne 1 ]; then
-    echo This script checks docker-manifest.csv to verify that the specified versions exist in nexus3
+    echo This script checks docker-manifest.csv to verify that the specified versions have been released in nexus3
     echo "$0 <docker-manifest.csv>"
     exit 1
 fi
@@ -10,18 +10,22 @@ 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_RELEASE_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 "[ERROR] $image:$tag not released"
+        #echo "$tags" | sed 's/^/  /'
         (( err++ ))
+    else
+        echo "[INFO] $image:$tag OK"
     fi
 done
 exit $err