deb_dpdk: add new 18.08.x branch

[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 ee6b82e..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,6 +65,8 @@ fi
 rm vpp-api-java*
 
 # install jvpp jars into maven repo, so that maven picks them up when building hc2vpp
+version=`./jvpp/version`
+
 current_dir=`pwd`
 cd /usr/share/java
 
@@ -69,7 +76,6 @@ for item in jvpp*.jar; do
     # Version = 17.01
     basefile=$(basename -s .jar "$item")
     artifactId=$(echo "$basefile" | cut -d '-' -f 1-2)
-    version=$(echo "$basefile" | cut -d '-' -f 3)
     mvn install:install-file -Dfile=${item} -DgroupId=io.fd.vpp -DartifactId=${artifactId} -Dversion=${version} -Dpackaging=jar -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r
 done