From: C.J. Collier <cjcollier@linuxfoundation.org>
Date: Tue, 11 Oct 2016 02:43:52 +0000 (-0700)
Subject: Purge Java 7
X-Git-Url: https://gerrit.fd.io/r/gitweb?a=commitdiff_plain;ds=sidebyside;h=99d47fd685613921a7623cd5f6f63cf00260cb38;p=ci-management.git

Purge Java 7

* prior to running the merge job, purge the openjdk-7-jre and openjdk-7-jdk packages
* sonar is failing due to not using the correct java version
* Specifying java 8 is insufficient
* Removing java 7 is the only working solution we've found.

Change-Id: I17d5d71c54f6fd3ea42afd8d96bb9281ba5cfce3
Signed-off-by: C.J. Collier <cjcollier@linuxfoundation.org>
---

diff --git a/jjb/honeycomb/honeycomb.yaml b/jjb/honeycomb/honeycomb.yaml
index f3a225f3b..1d21e2b78 100644
--- a/jjb/honeycomb/honeycomb.yaml
+++ b/jjb/honeycomb/honeycomb.yaml
@@ -185,7 +185,7 @@
 
     prebuilders:
         - shell: |
-            if [ "${{OS}}" == "ubuntu1404" ];then sudo update-java-alternatives -s /usr/lib/jvm/java-1.8.0-openjdk-amd64||echo 'ignoring failure';fi
+            if [ "${{OS}}" == "ubuntu1404" ];then sudo apt-get purge -qqy openjdk-7-jdk openjdk-7-jre openjdk-7-jre-headless ;fi
 
     maven:
         maven-name: '{mvn33}'