Rework the way Java version is set in CSIT jobs

[releng/builder.git] / jjb / netconf / netconf-userfeatures.yaml

diff --git a/jjb/netconf/netconf-userfeatures.yaml b/jjb/netconf/netconf-userfeatures.yaml
index 580649485edb97f19dc2cb8250a2a26f271b9370..114ba4d11e2ebbf0f931580373e8e3c5d6b61b89 100644 (file)
--- a/jjb/netconf/netconf-userfeatures.yaml
+++ b/jjb/netconf/netconf-userfeatures.yaml
@@ -2,7 +2,7 @@
     name: netconf-csit-userfeatures
     jobs:
         - '{project}-csit-1node-{functionality}-{install}-{stream}'
-        - '{project}-csit-verify-1node-{functionality}-{stream}'
+        - '{project}-csit-verify-1node-{functionality}'
 
     # The project name
     project: 'netconf'
@@ -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:
@@ -27,7 +32,7 @@
     mininet-image: 'rk-c-el6-mininet'
 
     # Features to install
-    install-features: 'odl-restconf,odl-netconf-mdsal,odl-netconf-connector-all'
+    install-features: 'odl-restconf,odl-netconf-mdsal,odl-clustering-test-app,odl-netconf-connector-all,odl-openflowplugin-all'
 
     # Robot custom options
     robot-options: '-v NETOPEER_USER:root'