Add java-alternatives in jobs

Allow lf-update-java-alternatives for verify
and merge jobs so that teams can configure a different
JDK version.
Using JDK8 by default

Issue-ID: CIMAN-33
Signed-off-by: Jessica Wagantall <jwagantall@linuxfoundation.org>
Change-Id: Ifd73d0598ef562695ead7147c8c27b1951bde405

diff --git a/jjb/global-templates-java.yaml b/jjb/global-templates-java.yaml
index 0995147..7640b54 100644 (file)
--- a/jjb/global-templates-java.yaml
+++ b/jjb/global-templates-java.yaml
@@ -18,6 +18,7 @@
     pom:
     mvn-opts: ''
     java-opts: ''
+    java-version: openjdk8
     properties:
       - infra-properties:
           build-days-to-keep: '{build-days-to-keep}'
@@ -52,6 +53,8 @@
 
     builders:
       - lf-infra-pre-build
+      - lf-update-java-alternatives:
+          java-version: "{java-version}"
       - provide-maven-settings:
           global-settings-file: 'global-settings'
           settings-file: '{mvn-settings}'
@@ -350,6 +353,7 @@
     mvn-params: ''
     mvn-opts: ''
     java-opts: ''
+    java-version: openjdk8
 
     properties:
       - infra-properties:
@@ -383,6 +387,8 @@
 
     builders:
       - lf-infra-pre-build
+      - lf-update-java-alternatives:
+          java-version: "{java-version}"
       - provide-maven-settings:
           global-settings-file: 'global-settings'
           settings-file: '{mvn-settings}'