Merge "Minimize CSIT dependencis in mininet-ovs-2.8 image"

[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 7220fe63f4087499a4bb8070f8efdce27a736e93..5fe72bee60c09a1b38bf84b23213b530811c415b 100644 (file)
--- a/jjb/tsdr/tsdr-csit-hsqldb.yaml
+++ b/jjb/tsdr/tsdr-csit-hsqldb.yaml
@@ -6,41 +6,34 @@
       - inttest-csit-verify-1node
 
     # The project name
-    project: 'tsdr'
+    project: "tsdr"
 
     # The functionality under test to verify
-    functionality: 'hsqldb-datastore'
+    functionality: "hsqldb-datastore"
 
     # Project branches
     stream:
+      - silicon:
+          branch: "master"
+          jre: "openjdk11"
+      - aluminium:
+          branch: "stable/aluminium"
+          jre: "openjdk11"
       - magnesium:
-          branch: 'master'
-      - sodium:
-          branch: 'stable/sodium'
-      - neon:
-          branch: 'stable/neon'
-          trigger-jobs: '{project}-merge-{stream}'
-          karaf-version: 'odl'
-          # yamllint disable-line rule:line-length
-          repo-url: 'mvn:org.opendaylight.tsdr/features-tsdr//xml/features'
-      - fluorine:
-          branch: 'stable/fluorine'
-          trigger-jobs: '{project}-merge-{stream}'
-          karaf-version: 'odl'
-          # yamllint disable-line rule:line-length
-          repo-url: 'mvn:org.opendaylight.tsdr/features-tsdr//xml/features'
+          branch: "stable/magnesium"
+          jre: "openjdk11"
 
     install:
       - all:
-          scope: 'all'
+          scope: "all"
 
     # Features to install
     install-features: >
-        odl-restconf,
-        odl-tsdr-hsqldb,
-        odl-tsdr-openflow-statistics-collector,
-        odl-tsdr-netflow-statistics-collector,
-        odl-tsdr-syslog-collector
+      odl-restconf,
+      odl-tsdr-hsqldb,
+      odl-tsdr-openflow-statistics-collector,
+      odl-tsdr-netflow-statistics-collector,
+      odl-tsdr-syslog-collector
 
     # Robot custom options
-    robot-options: ''
+    robot-options: ""