Rework the way Java version is set in CSIT jobs

[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 1d7b48290e2a30fd7ba0dbe304c34397184b7cab..95410219cf555c006ca73eba5ef16a959dbc6f63 100644 (file)
--- a/jjb/nic/nic-csit-basic.yaml
+++ b/jjb/nic/nic-csit-basic.yaml
@@ -12,10 +12,15 @@
 
     # Project branches
     stream:
-        - beryllium:
+        - boron:
             branch: 'master'
+            jre: 'openjdk8'
+        - beryllium:
+            branch: 'stable/beryllium'
+            jre: 'openjdk7'
         - stable-lithium:
             branch: 'stable/lithium'
+            jre: 'openjdk7'
 
     install:
         - only:
@@ -24,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-console'
 
     # Robot custom options
     robot-options: ''