X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fnetconf%2Fnetconf-userfeatures.yaml;h=abde4a7622bc064db3229e08ac6e06ff3bb54a1a;hb=c6dd8be243134ba5a87db1a2eb96b90452608f3d;hp=580649485edb97f19dc2cb8250a2a26f271b9370;hpb=f9cbe530759865c18a5e0c2e67287416721cbbd5;p=releng%2Fbuilder.git

diff --git a/jjb/netconf/netconf-userfeatures.yaml b/jjb/netconf/netconf-userfeatures.yaml
index 580649485..abde4a762 100644
--- 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,19 @@
 
     # Project branches
     stream:
-        - beryllium:
+        - carbon:
             branch: 'master'
+            jre: 'openjdk8'
+        - boron:
+            branch: 'stable/boron'
+            jre: 'openjdk8'
+        - beryllium:
+            branch: 'stable/beryllium'
+            jre: 'openjdk7'
         - stable-lithium:
+            disabled: true
             branch: 'stable/lithium'
+            jre: 'openjdk7'
 
     install:
         - only:
@@ -23,14 +32,11 @@
         - all:
             scope: 'all'
 
-    # Tools system configuration (formerly "mininet configuration"), this is needed as netopeer is only available in this vm
-    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'
 
     # Robot custom options
     robot-options: '-v NETOPEER_USER:root'
 
     # Trigger jobs (upstream dependencies)
-    trigger-jobs: 'odlparent-distribution-{stream},yangtools-distribution-{stream},controller-distribution-{stream},mdsal-distribution-{stream}'
+    trigger-jobs: 'yangtools-distribution-{stream},controller-distribution-{stream},mdsal-distribution-{stream}'