Allow specifying VPP package version in hc2vpp-integration job

Additionally revert commit https://gerrit.fd.io/r/6416

Change-Id: I35a4de91e275f7653a382f9908b3d672658c1bf1
Signed-off-by: selias <[email protected]>

diff --git a/jjb/hc2vpp/include-raw-hc2vpp-integration-prebuild.sh b/jjb/hc2vpp/include-raw-hc2vpp-integration-prebuild.sh
index 08f6898..c99d665 100644 (file)
--- a/jjb/hc2vpp/include-raw-hc2vpp-integration-prebuild.sh
+++ b/jjb/hc2vpp/include-raw-hc2vpp-integration-prebuild.sh
@@ -8,6 +8,15 @@ VERSION="RELEASE"
 GROUP="io.fd.vpp"
 ARTIFACTS="vpp-api-java"
 
+VERSION=`./vpp-version`
+if [ "${VERSION}" != 'RELEASE' ]; then
+    if [ "${OS}" == "centos7" ]; then
+        VERSION="${VERSION}.x86_64"
+    else
+        VERSION="${VERSION}_amd64"
+    fi
+fi
+
 if [ "${OS}" == "ubuntu1404" ]; then
     OS_PART="ubuntu.trusty.main"
     PACKAGE="deb deb.md5"
@@ -22,21 +31,13 @@ elif [ "${OS}" == "centos7" ]; then
     CLASS=""
 fi
 
-# 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`
+if [ "${STREAM}" == "master" ]; then
+    STREAM_PART="master"
 else
-    if [ "${STREAM}" == "master" ]; then
-        # use the newest master
-        STREAM_PART=".master"
-    else
-        # use stable version from branch
-        STREAM_PART=".stable.${STREAM}"
-    fi
+    STREAM_PART="stable.${STREAM}"
 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