Allow specifying VPP repository in hc2vpp-integration job 16/6416/2
authorselias <samelias@cisco.com>
Tue, 25 Apr 2017 12:49:33 +0000 (14:49 +0200)
committerSamuel Eliáš <samelias@cisco.com>
Tue, 25 Apr 2017 13:00:37 +0000 (13:00 +0000)
Release version of hc2vpp needs to use vpp-api-java package from release repo,
not stable/1704.

Change-Id: I60a590d10957586d30f56c20f58663d58ed489f4
Signed-off-by: selias <samelias@cisco.com>
jjb/hc2vpp/include-raw-hc2vpp-integration-prebuild.sh

index 8c9aed4..08f6898 100644 (file)
@@ -22,13 +22,21 @@ elif [ "${OS}" == "centos7" ]; then
     CLASS=""
 fi
 
-if [ "${STREAM}" == "master" ]; then
-    STREAM_PART="master"
+# determine nexus repository to download VPP packages from
+if [ -e vpp-stream ]; then
+    # override file is present, use the specified repo
+    STREAM_PART=`./vpp-stream`
 else
-    STREAM_PART="stable.${STREAM}"
+    if [ "${STREAM}" == "master" ]; then
+        # use the newest master
+        STREAM_PART=".master"
+    else
+        # use stable version from branch
+        STREAM_PART=".stable.${STREAM}"
+    fi
 fi
 
-REPO="fd.io.${STREAM_PART}.${OS_PART}"
+REPO="fd.io${STREAM_PART}.${OS_PART}"
 
 for ART in ${ARTIFACTS}; do
     for PAC in ${PACKAGE}; do