diff options
| author |   Marek Gradzki <mgradzki@cisco.com> | 2016-04-26 09:35:58 +0200 |
|---|---|---|
| committer |   Ed Warnicke <eaw@cisco.com> | 2016-04-29 03:18:09 -0400 |
| commit | db87147b322b30a5fd2a26d4e9cdace0444126cc (patch) | |
| tree | 0ab31ee721eec57a81755aec07fa908fe147b568 | |
| parent | 2ea6567acf97ddd46e3ac91b198c6b8bd865ab75 (diff) | |
VPP-8: use jdk8 for VPP builds
Change-Id: Ieec25be815128e53328493700d9a3d228bceba2b
Signed-off-by: Marek Gradzki <mgradzki@cisco.com>
| -rw-r--r-- | vagrant/basebuild/bootstrap.sh | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/vagrant/basebuild/bootstrap.sh b/vagrant/basebuild/bootstrap.sh index 1398925a0..f289c6333 100644 --- a/vagrant/basebuild/bootstrap.sh +++ b/vagrant/basebuild/bootstrap.sh @@ -1,5 +1,12 @@ ubuntu_systems() { + + if [ "$(lsb_release -r | awk '{print $2}')" == "14.04" ] + then + # openjdk-8-jdk is not available in 14.04 repos by default + add-apt-repository ppa:openjdk-r/ppa + fi + # Standard update + upgrade dance apt-get update apt-get upgrade -y @@ -21,7 +28,7 @@ ubuntu_systems() { apt-get install -y linux-image-extra-`uname -r` # Install jdk and maven - apt-get install -y openjdk-7-jdk + apt-get install -y openjdk-8-jdk # $$$ comment out for the moment # apt-get install -y --force-yes maven3 |