X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fbgpcep%2Fbgpcep-csit-userfeatures.yaml;h=cc3bb405725ad45f8c30dea33c297b740d96029e;hb=1164088496533bdd4746f8d66f6c6d523985457f;hp=8442d11dd63c18806b88859b8ca7f003eae794a6;hpb=2074d6c606284db9e707000451ca3c131323a0f8;p=releng%2Fbuilder.git

diff --git a/jjb/bgpcep/bgpcep-csit-userfeatures.yaml b/jjb/bgpcep/bgpcep-csit-userfeatures.yaml
index 8442d11dd..cc3bb4057 100644
--- a/jjb/bgpcep/bgpcep-csit-userfeatures.yaml
+++ b/jjb/bgpcep/bgpcep-csit-userfeatures.yaml
@@ -1,8 +1,8 @@
 - project:
     name: bgpcep-csit-userfeatures
     jobs:
-        - '{project}-csit-1node-cds-{functionality}-{install}-{stream}'
-        - '{project}-csit-verify-{functionality}-{stream}'
+        - '{project}-csit-1node-{functionality}-{install}-{stream}'
+        - '{project}-csit-verify-1node-{functionality}'
 
     # The project name
     project: 'bgpcep'
@@ -12,7 +12,7 @@
 
     # Project branches
     stream:
-        - master:
+        - beryllium:
             branch: 'master'
         - stable-lithium:
             branch: 'stable/lithium'
@@ -24,10 +24,20 @@
             scope: 'all'
 
     # Features to install
-    install-features: 'odl-restconf,odl-bgpcep-pcep-all,odl-bgpcep-bgp-all,odl-netconf-connector-all'
+    # *-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'
 
     # Robot custom options
     robot-options: ''
 
     # Trigger jobs (upstream dependencies)
-    trigger-jobs: 'odlparent-distribution-{stream},yangtools-distribution-{stream},controller-distribution-{stream},tcpmd5-distribution-{stream},bgpcep-distribution-{stream}'
+    # 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}