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 8a4488318aeec766eb74b3bc8644fa8aa24d1650..8443e1c8ddf9382fd31fc4bcd267948a9e044258 100644 (file)
--- a/jjb/nic/nic-csit-basic.yaml
+++ b/jjb/nic/nic-csit-basic.yaml
@@ -2,7 +2,7 @@
     name: nic-csit-basic
     jobs:
         - '{project}-csit-1node-{functionality}-{install}-{stream}'
-        - '{project}-csit-verify-1node-{functionality}-{stream}'
+        - '{project}-csit-verify-1node-{functionality}'
 
     # The project name
     project: 'nic'
@@ -12,10 +12,15 @@
 
     # Project branches
     stream:
-        - beryllium:
+        - boron:
             branch: 'master'
+            jdk: 'openjdk8'
+        - beryllium:
+            branch: 'stable/beryllium'
+            jdk: 'openjdk7'
         - stable-lithium:
             branch: 'stable/lithium'
+            jdk: 'openjdk7'
 
     install:
         - only:
@@ -23,12 +28,8 @@
         - all:
             scope: 'all'
 
-    # Mininet configuration
-    mininet-image: 'rk-c-el6-mininet'
-    mininet-vms: 1
-
     # 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: ''