diff options
| author |   C.J. Collier <cjcollier@linuxfoundation.org> | 2016-10-10 11:46:46 -0700 |
|---|---|---|
| committer | C.J. Collier <cjcollier@linuxfoundation.org> | 2016-10-10 11:46:46 -0700 |
| commit | 73e2a403a96e0ef2f6dd0637dbd5cef66a36b2e6 (patch) | |
| tree | c56f74d105785c0da41d0cf4ed0808070a41b4c1 /jjb | |
| parent | 66786f9e2e9fe1dc284dd884e8e7727856d8c306 (diff) | |
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>
Diffstat (limited to 'jjb')
| -rw-r--r-- | jjb/vpp/include-raw-vpp-build.sh | 7 | ||||
| -rw-r--r-- | jjb/vpp/include-raw-vpp-lite-build.sh | 7 |
2 files changed, 0 insertions, 14 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 "*******************************************************************" diff --git a/jjb/vpp/include-raw-vpp-lite-build.sh b/jjb/vpp/include-raw-vpp-lite-build.sh index 9e1133afd..5df60ca34 100644 --- 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 |