Make Java version for CSIT jobs configurable

[releng/builder.git] / jjb / nic / nic-csit-basic.yaml

diff --git a/jjb/nic/nic-csit-basic.yaml b/jjb/nic/nic-csit-basic.yaml
index 0baf9a4dcd635c05cbd64599a4dee8c36bf0b416..8443e1c8ddf9382fd31fc4bcd267948a9e044258 100644 (file)
--- a/jjb/nic/nic-csit-basic.yaml
+++ b/jjb/nic/nic-csit-basic.yaml
@@ -14,10 +14,13 @@
     stream:
         - boron:
             branch: 'master'
+            jdk: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
+            jdk: 'openjdk7'
         - stable-lithium:
             branch: 'stable/lithium'
+            jdk: 'openjdk7'
 
     install:
         - only:
@@ -26,7 +29,7 @@
             scope: 'all'
 
     # Features to install
-    install-features: 'odl-nic-core,odl-nic-console,odl-nic-renderer-vtn,odl-nic-renderer-gbp'
+    install-features: 'odl-nic-core-service-mdsal,odl-nic-console'
 
     # Robot custom options
     robot-options: ''