diff options
| author |   C.J. Collier <cjcollier@linuxfoundation.org> | 2016-05-06 17:00:58 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@fd.io> | 2016-05-06 17:00:58 +0000 |
| commit | 243d1fbbc7146792575b5ec920c1ad89b810abab (patch) | |
| tree | 5fa69ee708ae92d92b79a491ad298203fe573f46 /jjb/vpp | |
| parent | ef7b4e771dd98b010f667eaee6c1e24bfcf3b507 (diff) | |
| parent | d8d17c7448a7b9c59b4381951e25a12c7cdd1cd0 (diff) | |
Merge "Fix for java home for honeycomb"
Diffstat (limited to 'jjb/vpp')
| -rw-r--r-- | jjb/vpp/include-raw-vpp-build.sh | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/jjb/vpp/include-raw-vpp-build.sh b/jjb/vpp/include-raw-vpp-build.sh index 7ea6d6d59..e5a9be3f1 100644 --- 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 |