X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=jjb%2Finclude-docker-login.sh;h=8ecf44022c12256337fe5d6b9fe3ba4dae3e1f8e;hb=70a97ad469f64419d3dfb575da63d35cb2b29fc0;hp=f583f73f2efc0c7922534d71062db2fc1ff64e85;hpb=63e090e8af3609560cb0c0bb98391efa4c11954b;p=ci-management.git

diff --git a/jjb/include-docker-login.sh b/jjb/include-docker-login.sh
index f583f73f2..8ecf44022 100644
--- a/jjb/include-docker-login.sh
+++ b/jjb/include-docker-login.sh
@@ -1,12 +1,29 @@
 #!/bin/bash
 
-DOCKER_REPOSITORIES=nexus3.openecomp.org:10001 \
-                   nexus3.openecomp.org:10002 \
-                   nexus3.openecomp.org:10003
+# vim: ts=4 sw=4 sts=4 et :
+
+DOCKER_REPOSITORIES="nexus3.onap.org:10001 \
+                   nexus3.onap.org:10002 \
+                   nexus3.onap.org:10003 \
+                   nexus3.onap.org:10004"
 
 for DOCKER_REPOSITORY in $DOCKER_REPOSITORIES;
 do
-    USER=$(xpath -q -e "//servers/server[id='$DOCKER_REPOSITORY']/username/text()" "$SETTINGS_FILE")
-    PASS=$(xpath -q -e "//servers/server[id='$DOCKER_REPOSITORY']/password/text()" "$SETTINGS_FILE")
-    docker login $DOCKER_REPOSITORY -u $USER -p $PASS
+    echo $DOCKER_REPOSITORY
+    USER=$(xpath -e "//servers/server[id='$DOCKER_REPOSITORY']/username/text()" "$SETTINGS_FILE")
+    PASS=$(xpath -e "//servers/server[id='$DOCKER_REPOSITORY']/password/text()" "$SETTINGS_FILE")
+
+    if [ -z "$USER" ];
+    then
+        echo "Error: no user provided"
+    fi
+
+    if [ -z "$PASS" ];
+    then
+        echo "Error: no password provided"
+    fi
+
+    [ -z "$PASS" ] && PASS_PROVIDED="<empty>" || PASS_PROVIDED="<password>"
+    echo docker login $DOCKER_REPOSITORY -u "$USER" -p "$PASS_PROVIDED"
+    docker login $DOCKER_REPOSITORY -u "$USER" -p "$PASS"
 done