X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fbgpcep%2Fbgpcep-csit-userfeatures.yaml;h=41c9cd8b1d78a13e1b49f7ecdede7365ea05cd56;hb=c6dd8be243134ba5a87db1a2eb96b90452608f3d;hp=da1e69c8a8727e4cc05beaabc276fd612b89a6c4;hpb=cc052ad9de9dfedc76fad5154fad92b70eca7794;p=releng%2Fbuilder.git

diff --git a/jjb/bgpcep/bgpcep-csit-userfeatures.yaml b/jjb/bgpcep/bgpcep-csit-userfeatures.yaml
index da1e69c8a..41c9cd8b1 100644
--- a/jjb/bgpcep/bgpcep-csit-userfeatures.yaml
+++ b/jjb/bgpcep/bgpcep-csit-userfeatures.yaml
@@ -2,7 +2,7 @@
     name: bgpcep-csit-userfeatures
     jobs:
         - '{project}-csit-1node-{functionality}-{install}-{stream}'
-        - '{project}-csit-verify-1node-{functionality}-{stream}'
+        - '{project}-csit-verify-1node-{functionality}'
 
     # The project name
     project: 'bgpcep'
@@ -12,10 +12,19 @@
 
     # Project branches
     stream:
-        - beryllium:
+        - carbon:
             branch: 'master'
+            jre: 'openjdk8'
+        - boron:
+            branch: 'stable/boron'
+            jre: 'openjdk8'
+        - beryllium:
+            branch: 'stable/beryllium'
+            jre: 'openjdk7'
         - stable-lithium:
+            disabled: true
             branch: 'stable/lithium'
+            jre: 'openjdk7'
 
     install:
         - only:
@@ -24,10 +33,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,odl-bgpcep-bmp,odl-jolokia'
 
     # 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}