X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fbgpcep%2Fbgpcep-csit-userfeatures.yaml;h=0e0fd1cf070b56366d26231283d1e915f77ad22e;hb=889613a3ed8c1a0259a91aac1e4f2c2b66c4aa91;hp=7d4c346eaa1f7f3fe7d3debdbeddfee38f6d79a2;hpb=7ab3fd784625b957216cdb7ba4866effe0daea2a;p=releng%2Fbuilder.git

diff --git a/jjb/bgpcep/bgpcep-csit-userfeatures.yaml b/jjb/bgpcep/bgpcep-csit-userfeatures.yaml
index 7d4c346ea..0e0fd1cf0 100644
--- a/jjb/bgpcep/bgpcep-csit-userfeatures.yaml
+++ b/jjb/bgpcep/bgpcep-csit-userfeatures.yaml
@@ -18,9 +18,13 @@
         - boron:
             branch: 'stable/boron'
             jre: 'openjdk8'
+            install-features: 'odl-restconf,odl-bgpcep-pcep-all,odl-bgpcep-bgp-all,odl-bgpcep-bgp,odl-bgpcep-pcep,odl-netconf-connector-all,odl-bgpcep-bmp,odl-jolokia'
+            robot-options: '-v USE_NETCONF_CONNECTOR:True'
         - beryllium:
             branch: 'stable/beryllium'
             jre: 'openjdk7'
+            install-features: 'odl-restconf,odl-bgpcep-pcep-all,odl-bgpcep-bgp-all,odl-bgpcep-bgp,odl-bgpcep-pcep,odl-netconf-connector-all,odl-bgpcep-bmp,odl-jolokia'
+            robot-options: '-v USE_NETCONF_CONNECTOR:True'
 
     install:
         - only:
@@ -30,19 +34,7 @@
 
     # Features to install
     # *-all is for Beryllium and Boron, without -all is for Boron and Carbon.
-    install-features: 'odl-restconf,odl-bgpcep-pcep-all,odl-bgpcep-bgp-all,odl-bgpcep-bgp,odl-bgpcep-pcep,odl-netconf-connector-all,odl-bgpcep-bmp,odl-jolokia'
+    install-features: 'odl-restconf,odl-bgpcep-pcep,odl-bgpcep-bgp,odl-bgpcep-bmp,odl-jolokia'
 
     # Robot custom options
-    robot-options: ''
-
-    # Trigger jobs (upstream dependencies)
-    # Netconf is there for run-time re-configuration.
-    # AAA could also be a dependency, but probability of breakage is too low to trigger everytime.
-    trigger-jobs: >
-        odlparent-distribution-{stream},
-        yangtools-distribution-{stream},
-        controller-distribution-{stream},
-        mdsal-distribution-{stream},
-        netconf-distribution-{stream},
-        tcpmd5-distribution-{stream},
-        bgpcep-distribution-{stream}
+    robot-options: '-v USE_NETCONF_CONNECTOR:False'