Do not revert to java 7

* find and remove all instances of update-java-alternatives -s /usr/lib/jvm/java-1.7.0-openjdk-amd64

Change-Id: I2fe5167cc0210b6bb68d2fb072d020574ec3c42f
Signed-off-by: C.J. Collier <cjcollier@linuxfoundation.org>

diff --git a/jjb/vpp/include-raw-vpp-build.sh b/jjb/vpp/include-raw-vpp-build.sh
index a47fc62..2b9cd1e 100644 (file)
--- a/jjb/vpp/include-raw-vpp-build.sh
+++ b/jjb/vpp/include-raw-vpp-build.sh
@@ -46,13 +46,6 @@ if [ "x${VPP_REPO}" == "x1" ]; then
     fi
 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 -s /usr/lib/jvm/java-1.7.0-openjdk-amd64 || echo 'ignoring failure'
-fi
-
 build-root/vagrant/build.sh
 
 echo "*******************************************************************"

diff --git a/jjb/vpp/include-raw-vpp-lite-build.sh b/jjb/vpp/include-raw-vpp-lite-build.sh
index 9e1133a..5df60ca 100644 (file)
--- a/jjb/vpp/include-raw-vpp-lite-build.sh
+++ b/jjb/vpp/include-raw-vpp-lite-build.sh
@@ -46,13 +46,6 @@ if [ "x${VPP_REPO}" == "x1" ]; then
     fi
 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 -s /usr/lib/jvm/java-1.7.0-openjdk-amd64 || echo 'ignoring failure'
-fi
-
 make UNATTENDED=yes install-dep
 make PLATFORM=vpp_lite build-release