From 8c93b59f6c22d29669f22b75d22a8140a5669b9f Mon Sep 17 00:00:00 2001 From: Vratko Polak Date: Fri, 20 Nov 2015 16:50:14 +0100 Subject: [PATCH] jjb/bgpcep: Add new Beryllium projects as dependencies Also, functional CSIT job definition reformatted and comments added. Change-Id: I98e911d5585c9ee05198a8baed06231c75ce92e3 Signed-off-by: Vratko Polak --- jjb/bgpcep/bgpcep-csit-userfeatures.yaml | 12 +++++++++++- jjb/bgpcep/bgpcep.cfg | 2 +- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/jjb/bgpcep/bgpcep-csit-userfeatures.yaml b/jjb/bgpcep/bgpcep-csit-userfeatures.yaml index b6ac825b1..cc3bb4057 100644 --- 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 fb5132267..f6e7e63e9 100644 --- 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 -- 2.36.6