Merge "Perform docker login before pusing images"

diff --git a/jjb/global-macros.yaml b/jjb/global-macros.yaml
index 43f52f4..5815ccf 100644 (file)
--- a/jjb/global-macros.yaml
+++ b/jjb/global-macros.yaml
@@ -52,6 +52,11 @@
             - docker.pull.registry=nexus3.openecomp.org:10001
             - docker.push.registry=nexus3.openecomp.org:10003
 
+- builder:
+    name: docker-login
+    builders:
+      - shell: !include-raw: include-docker-login.sh
+
 # PARAMETERS
 - parameter:
     name: ecomp-infra-parameters

diff --git a/jjb/global-templates-java.yaml b/jjb/global-templates-java.yaml
index a9a368e..e11a658 100644 (file)
--- a/jjb/global-templates-java.yaml
+++ b/jjb/global-templates-java.yaml
@@ -334,10 +334,13 @@
       - timed: 'H 12 * * *'
 
     builders:
+
       - provide-maven-settings:
           global-settings-file: 'global-settings'
           settings-file: '{mvn-settings}'
 
+      - docker-login
+
       - maven-docker-push-daily:
           mvn-settings: '{mvn-settings}'
           pom: '{docker-pom}'

diff --git a/jjb/include-docker-login.sh b/jjb/include-docker-login.sh
new file mode 100644 (file)
index 0000000..f583f73
--- /dev/null
+++ b/jjb/include-docker-login.sh
@@ -0,0 +1,12 @@
+#!/bin/bash
+
+DOCKER_REPOSITORIES=nexus3.openecomp.org:10001 \
+                   nexus3.openecomp.org:10002 \
+                   nexus3.openecomp.org:10003
+
+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
+done