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 7ea6d6d..e5a9be3 100644 (file)
--- a/jjb/vpp/include-raw-vpp-build.sh
+++ b/jjb/vpp/include-raw-vpp-build.sh
@@ -11,4 +11,11 @@ else
     echo $CCACHE_DIR does not exist.  This must be a new slave.
 fi
 
+# 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
+
 build-root/vagrant/build.sh