Fix for java home for honeycomb

[ci-management.git] / jjb / vpp / include-raw-vpp-build.sh

diff --git a/jjb/vpp/include-raw-vpp-build.sh b/jjb/vpp/include-raw-vpp-build.sh
index d4b6d74..e5a9be3 100644 (file)
--- a/jjb/vpp/include-raw-vpp-build.sh
+++ b/jjb/vpp/include-raw-vpp-build.sh
@@ -11,18 +11,11 @@ else
     echo $CCACHE_DIR does not exist.  This must be a new slave.
 fi
 
-SUPPORTED="ubuntu1404 ubuntu1604 centos7"
-declare -A DIST_TARGET
-DIST_TARGET=(
-    [ubuntu1404]=install-deb
-    [ubuntu1604]=install-deb
-    [centos7]=install-rpm
-)
-if [[ ! ${SUPPORTED[*]} =~ ${OS} ]]
-then
-  echo "Unrecognized OS: ${OS}.  Please edit: https://gerrit.fd.io/r/gitweb?p=ci-management.git;a=blob;f=jjb/vpp/include-raw-vpp-build.sh;hb=HEAD"
-    exit 1
+# Make sure we are starting on java-7.  This catches bugs in the
+# vpp build system that can occur on Ubuntu 14.04 when a user may
+# have both java-7 and java-8 installed.
+if [ ${OS} == ubuntu1404 ];then
+    sudo update-java-alternatives /usr/lib/jvm/java-1.7.0-openjdk-amd64
 fi
-cd build-root/
-./bootstrap.sh
-make PLATFORM=vpp V=0 TAG=vpp ${DIST_TARGET[${OS}]}
\ No newline at end of file
+
+build-root/vagrant/build.sh