Merge "Add gate triggers for netvirt newton and learn"

diff --git a/jjb/groupbasedpolicy/groupbasedpolicy-csit-sxp.yaml b/jjb/groupbasedpolicy/groupbasedpolicy-csit-sxp.yaml
index b52e564aea52d93069dfd8f2b4d2b572aedf02d5..096dfb405b9703070b8c98f91c7bd3ef0ae62b21 100644 (file)
--- a/jjb/groupbasedpolicy/groupbasedpolicy-csit-sxp.yaml
+++ b/jjb/groupbasedpolicy/groupbasedpolicy-csit-sxp.yaml
@@ -22,7 +22,7 @@
     mininet-vms: 2
 
     # Features to install
-    install-features: 'odl-restconf,odl-groupbasedpolicy-sxp-ise-adapter,odl-groupbasedpolicy-ne-location-provider,odl-groupbasedpolicy-ios-xe,odl-sfc-ios-xe-renderer'
+    install-features: 'odl-restconf,odl-groupbasedpolicy-sxp-ise-adapter,odl-groupbasedpolicy-ne-location-provider,odl-groupbasedpolicy-ios-xe,odl-sfc-ios-xe-renderer,odl-sxp-controller'
 
     # Robot custom options
     robot-options: ''

diff --git a/jjb/netconf/netconf-userfeatures.yaml b/jjb/netconf/netconf-userfeatures.yaml
index bc71d5e81565247479ebb918055284c9eb1b0cdf..ab26168116fe7d955a3ca360e39df02b29488e9f 100644 (file)
--- a/jjb/netconf/netconf-userfeatures.yaml
+++ b/jjb/netconf/netconf-userfeatures.yaml
@@ -18,9 +18,13 @@
         - 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'
+            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:
@@ -29,10 +33,10 @@
             scope: 'all'
 
     # Features to install
-    install-features: 'odl-restconf,odl-netconf-mdsal,odl-clustering-test-app,odl-netconf-connector-all,odl-netconf-topology'
+    install-features: 'odl-restconf,odl-netconf-mdsal,odl-clustering-test-app,odl-netconf-topology'
 
     # Robot custom options
-    robot-options: '-v NETOPEER_USER:root -v USE_NETCONF_CONNECTOR:True'
+    robot-options: '-v NETOPEER_USER:root -v USE_NETCONF_CONNECTOR:False'
 
     # Trigger jobs (upstream dependencies)
     trigger-jobs: 'yangtools-distribution-{stream},controller-distribution-{stream},mdsal-distribution-{stream}'