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

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

diff --git a/jjb/tsdr/tsdr-csit-hbase.yaml b/jjb/tsdr/tsdr-csit-hbase.yaml
index cbc43af5823eb32a92819673d1201012ddb78905..160f68b0d2eec3d86d3c13d8dac890f13edbf816 100644 (file)
--- a/jjb/tsdr/tsdr-csit-hbase.yaml
+++ b/jjb/tsdr/tsdr-csit-hbase.yaml
@@ -2,39 +2,38 @@
 - project:
     name: tsdr-csit-hbase
     jobs:
-      - '{project}-csit-1node-{functionality}-{install}-{stream}'
-      - '{project}-csit-verify-1node-{functionality}'
+      - inttest-csit-1node
+      - inttest-csit-verify-1node
 
     # The project name
-    project: 'tsdr'
+    project: "tsdr"
 
     # The functionality under test to verify
-    functionality: 'hbase-datastore'
+    functionality: "hbase-datastore"
 
     # Project branches
     stream:
-      - oxygen:
-          branch: 'master'
-          jre: 'openjdk8'
-      - nitrogen:
-          branch: 'stable/nitrogen'
-          jre: 'openjdk8'
-      - carbon:
-          branch: 'stable/carbon'
-          jre: 'openjdk8'
-          karaf-version: karaf3
+      - silicon:
+          branch: "master"
+          jre: "openjdk11"
+      - aluminium:
+          branch: "stable/aluminium"
+          jre: "openjdk11"
+      - magnesium:
+          branch: "stable/magnesium"
+          jre: "openjdk11"
 
     install:
       - all:
-          scope: 'all'
+          scope: "all"
 
     # Features to install
     install-features: >
-        odl-restconf,
-        odl-tsdr-hbase,
-        odl-tsdr-openflow-statistics-collector,
-        odl-tsdr-netflow-statistics-collector,
-        odl-tsdr-syslog-collector
+      odl-restconf,
+      odl-tsdr-hbase,
+      odl-tsdr-openflow-statistics-collector,
+      odl-tsdr-netflow-statistics-collector,
+      odl-tsdr-syslog-collector
 
     # Robot custom options
-    robot-options: ''
+    robot-options: ""