From: Marek Gradzki <mgradzki@cisco.com>
Date: Tue, 26 Apr 2016 07:35:58 +0000 (+0200)
Subject: VPP-8: use jdk8 for VPP builds
X-Git-Url: https://gerrit.fd.io/r/gitweb?a=commitdiff_plain;h=db87147b322b30a5fd2a26d4e9cdace0444126cc;p=ci-management.git

VPP-8: use jdk8 for VPP builds

Change-Id: Ieec25be815128e53328493700d9a3d228bceba2b
Signed-off-by: Marek Gradzki <mgradzki@cisco.com>
---

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