summaryrefslogtreecommitdiffstats
path: root/jjb/vpp/include-raw-vpp-build.sh
diff options
context:
space:
mode:
Diffstat (limited to 'jjb/vpp/include-raw-vpp-build.sh')
-rw-r--r--jjb/vpp/include-raw-vpp-build.sh7
1 files changed, 0 insertions, 7 deletions
diff --git a/jjb/vpp/include-raw-vpp-build.sh b/jjb/vpp/include-raw-vpp-build.sh
index a47fc62ec..2b9cd1e83 100644
--- 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 "*******************************************************************"