Merge "jjb/bgpcep: Add new Beryllium projects as dependencies"

diff --git a/jjb/bgpcep/bgpcep-csit-userfeatures.yaml b/jjb/bgpcep/bgpcep-csit-userfeatures.yaml
index b6ac825b12fe403e3e9eaef165dc0002e4d3cdb2..cc3bb405725ad45f8c30dea33c297b740d96029e 100644 (file)
--- a/jjb/bgpcep/bgpcep-csit-userfeatures.yaml
+++ b/jjb/bgpcep/bgpcep-csit-userfeatures.yaml
@@ -24,10 +24,20 @@
             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'
 
     # 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}

diff --git a/jjb/bgpcep/bgpcep.cfg b/jjb/bgpcep/bgpcep.cfg
index fb51322679dfd5540ea3314bd82059e25dcb1a60..f6e7e63e9203ccd68ed4a5b86b251b1debee7cbb 100644 (file)
--- a/jjb/bgpcep/bgpcep.cfg
+++ b/jjb/bgpcep/bgpcep.cfg
@@ -10,4 +10,4 @@ STREAMS:
     jdks: openjdk7
 MVN_GOALS: -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r clean -DrepoBuild install javadoc:aggregate
 MVN_OPTS: -Xmx1024m -XX:MaxPermSize=256m
-DEPENDENCIES: odlparent,yangtools,controller,tcpmd5
+DEPENDENCIES: odlparent,yangtools,controller,mdsal,tcpmd5