Merge "Adding installation for Syslog and Netflow"

diff --combined jjb/tsdr/tsdr-csit-cassandra.yaml
index 6b353588f00bb5b20a76c5eb02700b5ce7c4005a,4c665f0b927042abb30a8502685eeed26c5e1c71..56539a19148fe6246a6e4c879324d97682c0e19c
--- 1/jjb/tsdr/tsdr-csit-cassandra.yaml
--- 2/jjb/tsdr/tsdr-csit-cassandra.yaml
+++ b/jjb/tsdr/tsdr-csit-cassandra.yaml
@@@ -14,13 -14,10 +14,13 @@@
      stream:
          - boron:
              branch: 'master'
 +            jdk: 'openjdk8'
          - beryllium:
              branch: 'stable/beryllium'
 +            jdk: 'openjdk7'
          - stable-lithium:
              branch: 'stable/lithium'
 +            jdk: 'openjdk7'
  
      install:
          - only:
@@@ -29,7 -26,7 +29,7 @@@
              scope: 'all'
  
      # Features to install
-     install-features: 'odl-restconf,odl-tsdr-cassandra,odl-tsdr-openflow-statistics-collector'
+     install-features: 'odl-restconf,odl-tsdr-cassandra,odl-tsdr-openflow-statistics-collector,odl-tsdr-netflow-statistics-collector,odl-tsdr-syslog-collector'
  
      # Robot custom options
      robot-options: ' '

diff --combined jjb/tsdr/tsdr-csit-hbase.yaml
index dcf7e5efbbcd118c7ed4834000545b028db405c2,ac78b3ea8b5495de0974a6eac37d0795628ccd49..5aa11c15bbf86df568dfae3d685365b0da011e10
--- 1/jjb/tsdr/tsdr-csit-hbase.yaml
--- 2/jjb/tsdr/tsdr-csit-hbase.yaml
+++ b/jjb/tsdr/tsdr-csit-hbase.yaml
@@@ -14,13 -14,10 +14,13 @@@
      stream:
          - boron:
              branch: 'master'
 +            jdk: 'openjdk8'
          - beryllium:
              branch: 'stable/beryllium'
 +            jdk: 'openjdk7'
          - stable-lithium:
              branch: 'stable/lithium'
 +            jdk: 'openjdk7'
  
      install:
          - only:
@@@ -29,7 -26,7 +29,7 @@@
              scope: 'all'
  
      # Features to install
-     install-features: 'odl-restconf,odl-tsdr-hbase,odl-tsdr-openflow-statistics-collector'
+     install-features: 'odl-restconf,odl-tsdr-hbase,odl-tsdr-openflow-statistics-collector,odl-tsdr-netflow-statistics-collector,odl-tsdr-syslog-collector'
  
      # Robot custom options
      robot-options: ' '

diff --combined jjb/tsdr/tsdr-csit-hsqldb.yaml
index 432966ae11786a35d799e12afa97db9a961d41f8,01e3f6fcf86617d1694bebe48aeadb0d6fd611ea..f3428a4ac37d4874f209bfb2e41624696df64fc8
--- 1/jjb/tsdr/tsdr-csit-hsqldb.yaml
--- 2/jjb/tsdr/tsdr-csit-hsqldb.yaml
+++ b/jjb/tsdr/tsdr-csit-hsqldb.yaml
@@@ -14,13 -14,10 +14,13 @@@
      stream:
          - boron:
              branch: 'master'
 +            jdk: 'openjdk8'
          - beryllium:
              branch: 'stable/beryllium'
 +            jdk: 'openjdk7'
          - stable-lithium:
              branch: 'stable/lithium'
 +            jdk: 'openjdk7'
  
      install:
          - only:
@@@ -29,7 -26,7 +29,7 @@@
              scope: 'all'
  
      # Features to install
-     install-features: 'odl-restconf,odl-tsdr-hsqldb,odl-tsdr-openflow-statistics-collector'
+     install-features: 'odl-restconf,odl-tsdr-hsqldb,odl-tsdr-openflow-statistics-collector,odl-tsdr-netflow-statistics-collector,odl-tsdr-syslog-collector'
  
      # Robot custom options
      robot-options: ' '