From 65f7f6367cbab0765b32e1a0cf6b78cadcef18b7 Mon Sep 17 00:00:00 2001
From: Arun Arora <aroraarun@vmware.com>
Date: Mon, 23 Oct 2017 14:33:51 +0530
Subject: VMWare vesagent docker build job fix

Fixes for docker daily build jenkins job failure
Modified the code to download the vesagent JAR
from nexus repo instead of building the code
and copy from the target directory

Change-Id: Ia6b303e7a39bc4bbef40d4caaca4dab401927d42
Issue-ID: MULTICLOUD-8
Signed-off-by: Arun Arora <aroraarun@vmware.com>
---
 vesagent/docker/Dockerfile      |  4 ++++
 vesagent/docker/docker-build.sh | 17 -----------------
 2 files changed, 4 insertions(+), 17 deletions(-)

diff --git a/vesagent/docker/Dockerfile b/vesagent/docker/Dockerfile
index 3b5b8e4..732a263 100644
--- a/vesagent/docker/Dockerfile
+++ b/vesagent/docker/Dockerfile
@@ -19,6 +19,10 @@ WORKDIR /opt
 # Copy the local opt directory contents into the container at /opt
 ADD opt /opt
 
+#Download vesagent jar from nexus repo and place in /opt
+RUN  cd /opt/ && \
+    wget -O /opt/vesagent-1.0.0-SNAPSHOT.jar 'https://nexus.onap.org/service/local/artifact/maven/redirect?r=snapshots&g=org.onap.multicloud.openstack.vmware&a=vesagent&v=LATEST&e=jar'
+
 # Install any needed packages specified in requirements.txt
 RUN pip install -r requirements.txt
 
diff --git a/vesagent/docker/docker-build.sh b/vesagent/docker/docker-build.sh
index 2b2f100..0260e9e 100755
--- a/vesagent/docker/docker-build.sh
+++ b/vesagent/docker/docker-build.sh
@@ -2,23 +2,6 @@
 echo "WORKSPACE: ${WORKSPACE}"
 VERSION="1.0.0-SNAPSHOT"
 
-#
-# Copy vesagent Uber JAR to docker app directory
-#
-APP=${WORKSPACE}/vesagent/target/vesagent-${VERSION}.jar
-
-if [ ! -f "${APP}" ]
-then
-    echo "FATAL error cannot locate ${APP}"
-    exit 2
-fi
-
-APP_DIR=${WORKSPACE}/vesagent/docker/opt
-
-[ -d "${APP_DIR}/vesagent-${VERSION}.jar" ] && rm -rf "${APP_DIR}/vesagent-${VERSION}.jar"
-
-cp ${APP} ${APP_DIR}
-
 #
 # Copy configurations directory
 #
-- 
cgit 1.2.3-korg