summaryrefslogtreecommitdiffstats
path: root/jjb/honeycomb
diff options
context:
space:
mode:
authorC.J. Collier <cjcollier@linuxfoundation.org>2016-10-10 19:43:52 -0700
committerC.J. Collier <cjcollier@linuxfoundation.org>2016-10-11 11:26:49 -0700
commit99d47fd685613921a7623cd5f6f63cf00260cb38 (patch)
tree5e4088bf7fcd69b0a4ab75ce5d8fedbab0fc5d9c /jjb/honeycomb
parentd73ee2b83c4b072d8df1d0718e7749939cde4f36 (diff)
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>
Diffstat (limited to 'jjb/honeycomb')
-rw-r--r--jjb/honeycomb/honeycomb.yaml2
1 files changed, 1 insertions, 1 deletions
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}'