X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fnetconf%2Fnetconf-userfeatures.yaml;h=3375f6578c06a4f0b32b96e543dba28ca54c0889;hb=44578331f163d00374970db0965231e2b7bfbb7e;hp=146d369c549202acbf5b90b5709606fc40fe5b1c;hpb=213e106cd3b54d1cc2384dd26f3c9da7616e43ed;p=releng%2Fbuilder.git

diff --git a/jjb/netconf/netconf-userfeatures.yaml b/jjb/netconf/netconf-userfeatures.yaml
index 146d369c5..3375f6578 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'
@@ -14,10 +14,13 @@
     stream:
         - boron:
             branch: 'master'
+            jre: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
+            jre: 'openjdk7'
         - stable-lithium:
             branch: 'stable/lithium'
+            jre: 'openjdk7'
 
     install:
         - only:
@@ -25,14 +28,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-clustering-test-app,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'
 
     # 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}'