Rework the way Java version is set in CSIT jobs

[releng/builder.git] / jjb / tsdr / tsdr-csit-hsqldb.yaml

diff --git a/jjb/tsdr/tsdr-csit-hsqldb.yaml b/jjb/tsdr/tsdr-csit-hsqldb.yaml
index 432966ae11786a35d799e12afa97db9a961d41f8..f94e01313931fc7f2d71b8f1121c9a8a1449116b 100644 (file)
--- a/jjb/tsdr/tsdr-csit-hsqldb.yaml
+++ b/jjb/tsdr/tsdr-csit-hsqldb.yaml
@@ -14,22 +14,17 @@
     stream:
         - boron:
             branch: 'master'
-            jdk: 'openjdk8'
+            jre: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
-            jdk: 'openjdk7'
-        - stable-lithium:
-            branch: 'stable/lithium'
-            jdk: 'openjdk7'
+            jre: 'openjdk7'
 
     install:
         - only:
             scope: 'only'
-        - all:
-            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: ' '