Merge "Add CSIT job for DIDM discovery tests."

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

diff --git a/jjb/netconf/netconf-userfeatures.yaml b/jjb/netconf/netconf-userfeatures.yaml
index ec87dcf5ce5b1b882e5196d95ed68f64e2dbe36f..33c265025c2ef9e097f061df014307b5fc2cf519 100644 (file)
--- a/jjb/netconf/netconf-userfeatures.yaml
+++ b/jjb/netconf/netconf-userfeatures.yaml
@@ -12,8 +12,10 @@
 
     # Project branches
     stream:
-        - beryllium:
+        - boron:
             branch: 'master'
+        - beryllium:
+            branch: 'stable/beryllium'
         - stable-lithium:
             branch: 'stable/lithium'
 
@@ -23,9 +25,8 @@
         - all:
             scope: 'all'
 
-    # Tools system configuration (formerly "mininet configuration")
+    # Tools system configuration (formerly "mininet configuration"), this is needed as netopeer is only available in this vm
     mininet-image: 'rk-c-el6-mininet'
-    mininet-vms: 1
 
     # Features to install
     install-features: 'odl-restconf,odl-netconf-mdsal,odl-netconf-connector-all'