Merge "Set concurrent to false for docs-verify job"

[ci-management.git] / jjb / hc2vpp / include-raw-hc2vpp-integration-prebuild.sh

diff --git a/jjb/hc2vpp/include-raw-hc2vpp-integration-prebuild.sh b/jjb/hc2vpp/include-raw-hc2vpp-integration-prebuild.sh
index 8c9aed4..f5da45a 100644 (file)
--- a/jjb/hc2vpp/include-raw-hc2vpp-integration-prebuild.sh
+++ b/jjb/hc2vpp/include-raw-hc2vpp-integration-prebuild.sh
@@ -8,11 +8,16 @@ VERSION="RELEASE"
 GROUP="io.fd.vpp"
 ARTIFACTS="vpp-api-java"
 
-if [ "${OS}" == "ubuntu1404" ]; then
-    OS_PART="ubuntu.trusty.main"
-    PACKAGE="deb deb.md5"
-    CLASS="deb"
-elif [ "${OS}" == "ubuntu1604" ]; then
+VERSION=`./vpp-version`
+if [ "${VERSION}" != 'RELEASE' ]; then
+    if [ "${OS}" == "centos7" ]; then
+        VERSION="${VERSION}.x86_64"
+    else
+        VERSION="${VERSION}_amd64"
+    fi
+fi
+
+if [ "${OS}" == "ubuntu1604" ]; then
     OS_PART="ubuntu.xenial.main"
     PACKAGE="deb deb.md5"
     CLASS="deb"
@@ -60,7 +65,7 @@ fi
 rm vpp-api-java*
 
 # install jvpp jars into maven repo, so that maven picks them up when building hc2vpp
-version=`./jvpp-version`
+version=`./jvpp/version`
 
 current_dir=`pwd`
 cd /usr/share/java