From: C.J. Collier <cjcollier@linuxfoundation.org>
Date: Wed, 5 Oct 2016 16:00:01 +0000 (-0700)
Subject: Do not revert to java 7
X-Git-Url: https://gerrit.fd.io/r/gitweb?a=commitdiff_plain;h=a90bdbfa849a207ae59d09019a3c7f27dff17ec4;p=ci-management.git

Do not revert to java 7

* honeycomb-merge-master-ubuntu1404 needs java 8 for sonar
* the revert to java 7 happens prior to the sonar run
* we now throw the guest away after each use, so there is no need to
  revert to java 7

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

diff --git a/jjb/honeycomb/honeycomb.yaml b/jjb/honeycomb/honeycomb.yaml
index 4c6785057..30a4b0fc2 100644
--- a/jjb/honeycomb/honeycomb.yaml
+++ b/jjb/honeycomb/honeycomb.yaml
@@ -205,10 +205,6 @@
         global-settings: 'global-settings'
         global-settings-type: cfp
 
-    postbuilders:
-        - shell: |
-            if [ "${{OS}}" == "ubuntu1404" ];then sudo update-java-alternatives -s /usr/lib/jvm/java-1.7.0-openjdk-amd64||echo 'ignoring failure';fi
-
     reporters:
         - findbugs