From 600dc509b633368628423a721df87a9b7f56703d Mon Sep 17 00:00:00 2001 From: =?utf8?q?Martin=20Mih=C3=A1lek?= Date: Tue, 21 Jun 2016 14:59:21 +0200 Subject: [PATCH] Cleanup of SXP Jenkins Jobs MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Removed Dependencies on TCPMD5 project, updated install-features for CSIT with odl-sxp-controller instead of odl-sxp-all which are eqivalent. Change-Id: Iba526a6e99eb3a9d71b9f1e80c2360bc8d1c798c Signed-off-by: Martin Mihálek --- jjb/sxp/sxp-csit-basic.yaml | 4 ++-- jjb/sxp/sxp-csit-filtering.yaml | 4 ++-- jjb/sxp/sxp-csit-topology.yaml | 4 ++-- jjb/sxp/sxp.cfg | 2 +- jjb/sxp/sxp.yaml | 4 ++-- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/jjb/sxp/sxp-csit-basic.yaml b/jjb/sxp/sxp-csit-basic.yaml index 2b575c8da..182609865 100644 --- a/jjb/sxp/sxp-csit-basic.yaml +++ b/jjb/sxp/sxp-csit-basic.yaml @@ -28,10 +28,10 @@ scope: 'all' # Features to install - install-features: 'odl-restconf,odl-sxp-all' + install-features: 'odl-restconf,odl-sxp-controller' # Robot custom options robot-options: '' # Trigger jobs (upstream dependencies) - trigger-jobs: 'yangtools-distribution-{stream},controller-distribution-{stream},tcpmd5-distribution-{stream},sxp-distribution-{stream},mdsal-distribution-{stream},netconf-distribution-{stream}' + trigger-jobs: 'yangtools-distribution-{stream},controller-distribution-{stream},sxp-distribution-{stream},mdsal-distribution-{stream},netconf-distribution-{stream}' diff --git a/jjb/sxp/sxp-csit-filtering.yaml b/jjb/sxp/sxp-csit-filtering.yaml index 994325e8d..a92ff5dc4 100644 --- a/jjb/sxp/sxp-csit-filtering.yaml +++ b/jjb/sxp/sxp-csit-filtering.yaml @@ -25,10 +25,10 @@ scope: 'all' # Features to install - install-features: 'odl-restconf,odl-sxp-all' + install-features: 'odl-restconf,odl-sxp-controller' # Robot custom options robot-options: '' # Trigger jobs (upstream dependencies) - trigger-jobs: 'yangtools-distribution-{stream},controller-distribution-{stream},tcpmd5-distribution-{stream},sxp-distribution-{stream},mdsal-distribution-{stream},netconf-distribution-{stream}' + trigger-jobs: 'yangtools-distribution-{stream},controller-distribution-{stream},sxp-distribution-{stream},mdsal-distribution-{stream},netconf-distribution-{stream}' diff --git a/jjb/sxp/sxp-csit-topology.yaml b/jjb/sxp/sxp-csit-topology.yaml index 01c9844a4..ee8714bd0 100644 --- a/jjb/sxp/sxp-csit-topology.yaml +++ b/jjb/sxp/sxp-csit-topology.yaml @@ -28,10 +28,10 @@ scope: 'all' # Features to install - install-features: 'odl-restconf,odl-sxp-all' + install-features: 'odl-restconf,odl-sxp-controller' # Robot custom options robot-options: '' # Trigger jobs (upstream dependencies) - trigger-jobs: 'yangtools-distribution-{stream},controller-distribution-{stream},tcpmd5-distribution-{stream},sxp-distribution-{stream},mdsal-distribution-{stream},netconf-distribution-{stream}' + trigger-jobs: 'yangtools-distribution-{stream},controller-distribution-{stream},sxp-distribution-{stream},mdsal-distribution-{stream},netconf-distribution-{stream}' diff --git a/jjb/sxp/sxp.cfg b/jjb/sxp/sxp.cfg index 230e2cbf2..c0643483b 100644 --- a/jjb/sxp/sxp.cfg +++ b/jjb/sxp/sxp.cfg @@ -13,4 +13,4 @@ STREAMS: distribution-check: false # MVN_GOALS: clean install javadoc:aggregate -DrepoBuild -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r MVN_OPTS: -Xmx1024m -XX:MaxPermSize=256m -DEPENDENCIES: odlparent,controller,yangtools,tcpmd5 +DEPENDENCIES: odlparent,controller,yangtools diff --git a/jjb/sxp/sxp.yaml b/jjb/sxp/sxp.yaml index 8eec22b0f..17b47e6f5 100644 --- a/jjb/sxp/sxp.yaml +++ b/jjb/sxp/sxp.yaml @@ -509,7 +509,7 @@ triggers: - reverse: - jobs: 'odlparent-merge-{stream},controller-merge-{stream},yangtools-merge-{stream},tcpmd5-merge-{stream}' + jobs: 'odlparent-merge-{stream},controller-merge-{stream},yangtools-merge-{stream}' result: 'success' prebuilders: @@ -532,7 +532,7 @@ publishers: - email-notification: - email-prefix: '[sxp] [odlparent] [controller] [yangtools] [tcpmd5]' + email-prefix: '[sxp] [odlparent] [controller] [yangtools]' - jacoco-report - job-template: -- 2.36.6