Fix honeycomb-merge jobs failing to publish sonar

Jenkins 2 moved the JDK configuration to a new Jenkins global
configuration page under Manage Jenkins > Global Tool Configuration. The
fd.io instance of Jenkins was missing JDK configuration which as now
been rectified.

Additionally this patch configures the Jobs to run using a specified JDK
as configured via Jenkins global configuration. Valid values are:

- openjdk7-centos7
- openjdk8-centos8
- openjdk7-ubuntu1404
- openjdk8-ubuntu1404
- openjdk7-ubuntu1604
- openjdk8-ubuntu1604

This patch configures HoneyComb merge job to run using JDK8.

Follow on patches should be submitted to ensure all jobs explicitly
specify which JDK versions they need to run against.

RT: 30789
Change-Id: I71d281a0ea5b2dd3f1f45b9ea4acbff73765bd05
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>

diff --git a/jjb/honeycomb/honeycomb.yaml b/jjb/honeycomb/honeycomb.yaml
index 72b1222..d088336 100644 (file)
--- a/jjb/honeycomb/honeycomb.yaml
+++ b/jjb/honeycomb/honeycomb.yaml
@@ -148,6 +148,7 @@
     name: 'honeycomb-merge-{stream}-{os}'
     project-type: maven
     node: merge-{os}
+    jdk: openjdk8-{os}
 
     logrotate:
         daysToKeep: '{build-days-to-keep}'
@@ -183,10 +184,6 @@
             name: 'honeycomb'
             branch: '{branch}'
 
-    prebuilders:
-        - shell: |
-            if [ "${{OS}}" == "ubuntu1404" ];then sudo apt-get purge -qqy openjdk-7-jdk openjdk-7-jre openjdk-7-jre-headless ;fi
-
     maven:
         maven-name: '{mvn33}'
         root-pom: 'pom.xml'
@@ -201,6 +198,10 @@
         - findbugs
 
     publishers:
+        - sonar:
+            jdk: 'openjdk8-{os}'
+            language: 'java'
+            branch: '{stream}'
         - email-notification:
             email-prefix: '[honeycomb]'