Merge "Cleanup of SXP Jenkins Jobs"

diff --combined jjb/sxp/sxp.yaml
index 4028d5b972f0f06140cd639067c425ae1baa2c49,17b47e6f58dcedf3e047b337a509b25444a09ab2..2945f894ecd10af0cf4be20ce29e407c96d1ea14
--- 1/jjb/sxp/sxp.yaml
--- 2/jjb/sxp/sxp.yaml
+++ b/jjb/sxp/sxp.yaml
@@@ -378,8 -378,8 +378,8 @@@
      jdk: '{jdk}'
  
      logrotate:
 -        daysToKeep: '14'
 -        numToKeep: '10'
 +        daysToKeep: '{build-days-to-keep}'
 +        numToKeep: '{build-num-to-keep}'
          artifactDaysToKeep: '{build-artifact-days-to-keep}'
          artifactNumToKeep: '{build-artifact-num-to-keep}'
  
@@@ -509,7 -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 +532,7 @@@
  
      publishers:
          - email-notification:
-             email-prefix: '[sxp] [odlparent] [controller] [yangtools] [tcpmd5]'
+             email-prefix: '[sxp] [odlparent] [controller] [yangtools]'
          - jacoco-report
  
  - job-template: