X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fbgpcep%2Fbgpcep-csit-userfeatures.yaml;h=0e0fd1cf070b56366d26231283d1e915f77ad22e;hb=61c9243cec4a945374ec488415c25edb3a4764a0;hp=1c35df72e57e85cb73f8151b250b19ae70126e1a;hpb=5bae7cd8254aff34e1e3772769b6268ec913b5d6;p=releng%2Fbuilder.git

diff --git a/jjb/bgpcep/bgpcep-csit-userfeatures.yaml b/jjb/bgpcep/bgpcep-csit-userfeatures.yaml
index 1c35df72e..0e0fd1cf0 100644
--- a/jjb/bgpcep/bgpcep-csit-userfeatures.yaml
+++ b/jjb/bgpcep/bgpcep-csit-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-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'
-        - stable-lithium:
-            branch: 'stable/lithium'
-            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:
@@ -29,20 +33,8 @@
             scope: 'all'
 
     # Features to install
-    # *-all is for Lithium and Beryllium, without -all is for Lithium and Boron.
-    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'
+    # *-all is for Beryllium and Boron, without -all is for Boron and Carbon.
+    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'