Make Java version for CSIT jobs configurable

[releng/builder.git] / jjb / releng-defaults.yaml

diff --git a/jjb/releng-defaults.yaml b/jjb/releng-defaults.yaml
index ea6b6c49ede1ddd72fa50d03096cd36302f794f0..4d4861c76561d01ce748ec534d3e5a0306bab1f7 100644 (file)
--- a/jjb/releng-defaults.yaml
+++ b/jjb/releng-defaults.yaml
@@ -15,7 +15,7 @@
     mvn30: 'Maven 3.0.5'
     mvn31: 'Maven 3.1.1'
     mvn32: 'Maven 3.2.5'
-    mvn33: 'Maven 3.3.3'
+    mvn33: 'Maven 3.3.9'
 
     # Config File Provider ID mapping
     odl-global-settings: 'org.jenkinsci.plugins.configfiles.maven.GlobalMavenSettingsConfig1414604295262'
@@ -38,7 +38,9 @@
     faas-settings: 'org.jenkinsci.plugins.configfiles.maven.MavenSettingsConfig1439224546991'
     groupbasedpolicy-settings: 'org.jenkinsci.plugins.configfiles.maven.MavenSettingsConfig1414694120607'
     integration-settings: 'org.jenkinsci.plugins.configfiles.maven.MavenSettingsConfig1414693976622'
+    integration-distribution-settings: 'org.jenkinsci.plugins.configfiles.maven.MavenSettingsConfig1414693976622'
     iotdm-settings: 'org.jenkinsci.plugins.configfiles.maven.MavenSettingsConfig1418228763195'
+    kafkaproducer-settings: 'org.jenkinsci.plugins.configfiles.maven.MavenSettingsConfig1452526644682'
     l2switch-settings: 'org.jenkinsci.plugins.configfiles.maven.MavenSettingsConfig1414694505032'
     lacp-settings: 'org.jenkinsci.plugins.configfiles.maven.MavenSettingsConfig1418417438677'
     lispflowmapping-settings: 'org.jenkinsci.plugins.configfiles.maven.MavenSettingsConfig1414695029968'
@@ -63,6 +65,7 @@
     packetcable-settings: 'org.jenkinsci.plugins.configfiles.maven.MavenSettingsConfig1414694813889'
     persistence-settings: 'org.jenkinsci.plugins.configfiles.maven.MavenSettingsConfig1419261915738'
     plugin2oc-settings: 'org.jenkinsci.plugins.configfiles.maven.MavenSettingsConfig1414694181775'
+    releng-builder-settings: 'org.jenkinsci.plugins.configfiles.maven.MavenSettingsConfig1441070717376'
     reservation-settings: 'org.jenkinsci.plugins.configfiles.maven.MavenSettingsConfig1414702190363'
     sdninterfaceapp-settings: 'org.jenkinsci.plugins.configfiles.maven.MavenSettingsConfig1414701835766'
     sfc-settings: 'org.jenkinsci.plugins.configfiles.maven.MavenSettingsConfig1414694586132'
@@ -80,6 +83,7 @@
     usecplugin-settings: 'org.jenkinsci.plugins.configfiles.maven.MavenSettingsConfig1439306569008'
     vpnservice-settings: 'org.jenkinsci.plugins.configfiles.maven.MavenSettingsConfig1423083445104'
     vtn-settings: 'org.jenkinsci.plugins.configfiles.maven.MavenSettingsConfig1414701949484'
+    yangide-settings: 'org.jenkinsci.plugins.configfiles.maven.MavenSettingsConfig1448465159080'
     yangtools-settings: 'org.jenkinsci.plugins.configfiles.maven.MavenSettingsConfig1414695171776'
     yang-push-settings: 'org.jenkinsci.plugins.configfiles.maven.MavenSettingsConfig1440438380950'
 
@@ -96,3 +100,7 @@
     # Mininet configuration
     mininet-image: 'rk-c-el6-mininet'
     mininet-vms: 1
+    mininet-cloud-name: 'Rackspace DFW - Integration Dynamic Lab'
+
+    # In case a CSIT job is merged without Java version specified
+    jdk: 'openjdk8'