Cleanup of SXP Jenkins Jobs

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 <mamihale@cisco.com>

diff --git a/jjb/sxp/sxp-csit-basic.yaml b/jjb/sxp/sxp-csit-basic.yaml
index 2b575c8daba1e9242cefea309b0ef6bdbd2ebf01..1826098656e24e802ddf4b9e3e160541dc5966e1 100644 (file)
--- 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 994325e8db9a0afe392b63f0e6a510f51f78a5fb..a92ff5dc4ae6d3bda1fe4890cdb97fb6e41a0793 100644 (file)
--- 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 01c9844a4d139f3e970f9990e133b5dea9ec56db..ee8714bd060bec2e04975904bee8dc11b615f69b 100644 (file)
--- 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 230e2cbf2cc1b43f6a9a9d4dec6582db16baa4c6..c0643483b9c1e6b2a7071d4455143291518fdd12 100644 (file)
--- 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 8eec22b0fae649aa6869cf508742c8451af4b66b..17b47e6f58dcedf3e047b337a509b25444a09ab2 100644 (file)
--- 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: