diff options
| author |   Ed Warnicke <eaw@cisco.com> | 2016-05-06 10:50:45 -0500 |
|---|---|---|
| committer | Ed Warnicke <eaw@cisco.com> | 2016-05-06 11:17:29 -0500 |
| commit | d8d17c7448a7b9c59b4381951e25a12c7cdd1cd0 (patch) | |
| tree | 579ea1577809900e2ce831c721f45fab42ae74de /jjb/vpp | |
| parent | 35f70352f66badc4bbd6cd9f81cf88628be75c64 (diff) | |
Fix for java home for honeycomb
Change-Id: Ib4381c10763251105ca1fc418e70c0e06905ba9a
Signed-off-by: Ed Warnicke <eaw@cisco.com>
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 |