Merge "Do not pinpoint version of elasticsearch*"

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

diff --git a/jjb/netconf/netconf-userfeatures.yaml b/jjb/netconf/netconf-userfeatures.yaml
index 114ba4d11e2ebbf0f931580373e8e3c5d6b61b89..bbf91ebc8eb02147138dfd2eaa9e04d44b752e2d 100644 (file)
--- a/jjb/netconf/netconf-userfeatures.yaml
+++ b/jjb/netconf/netconf-userfeatures.yaml
@@ -12,15 +12,19 @@
 
     # Project branches
     stream:
-        - boron:
+        - carbon:
             branch: 'master'
             jre: 'openjdk8'
+        - boron:
+            branch: 'stable/boron'
+            jre: 'openjdk8'
+            install-features: 'odl-restconf,odl-netconf-mdsal,odl-clustering-test-app,odl-netconf-connector-all,odl-netconf-topology'
+            robot-options: '-v NETOPEER_USER:root -v USE_NETCONF_CONNECTOR:True'
         - beryllium:
             branch: 'stable/beryllium'
             jre: 'openjdk7'
-        - stable-lithium:
-            branch: 'stable/lithium'
-            jre: 'openjdk7'
+            install-features: 'odl-restconf,odl-netconf-mdsal,odl-clustering-test-app,odl-netconf-connector-all,odl-netconf-topology'
+            robot-options: '-v NETOPEER_USER:root -v USE_NETCONF_CONNECTOR:True'
 
     install:
         - only:
@@ -28,14 +32,8 @@
         - 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,odl-openflowplugin-all'
+    install-features: 'odl-restconf,odl-netconf-mdsal,odl-clustering-test-app,odl-netconf-topology'
 
     # 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}'
+    robot-options: '-v NETOPEER_USER:root -v USE_NETCONF_CONNECTOR:False'