Merge "Add JDK17 verify jobs for daexim/jsonrpc/serviceutils"

[releng/builder.git] / jjb / daexim / daexim-csit-basic.yaml

diff --git a/jjb/daexim/daexim-csit-basic.yaml b/jjb/daexim/daexim-csit-basic.yaml
index b828d39e55e2cf8ba833abbb1559a3093022096b..a3f88694c069cf4cd43bb5f11dbc23ad258137af 100644 (file)
--- a/jjb/daexim/daexim-csit-basic.yaml
+++ b/jjb/daexim/daexim-csit-basic.yaml
@@ -1,33 +1,40 @@
+---
 - project:
     name: daexim-csit-basic
     jobs:
-        - '{project}-csit-1node-{functionality}-{install}-{stream}'
+      - inttest-csit-1node
 
     # The project name
-    project: 'daexim'
+    project: "daexim"
 
     # The functionality under test
-    functionality: 'basic'
+    functionality: "basic"
 
     # Project branches
     stream:
-        - carbon:
-            branch: 'master'
-            jre: 'openjdk8'
+      - sulfur:
+          branch: "master"
+          jre: "openjdk11"
+      - phosphorus:
+          branch: "stable/phosphorus"
+          jre: "openjdk11"
+      - silicon:
+          branch: "stable/silicon"
+          jre: "openjdk11"
 
     install:
-        - only:
-            scope: 'only'
+      - only:
+          scope: "only"
 
     # no mininet required
-    mininet-vms: 0
+    tools_system_count: 0
 
     # Features to install
-    install-features: 'odl-daexim-all,odl-netconf-topology'
+    install-features: >
+      odl-daexim-all,
+      odl-netconf-topology,
+      odl-jolokia,
+      odl-restconf-nb-bierman02
 
     # Robot custom options
-    robot-options: ''
-
-    # Trigger jobs (upstream dependencies)
-    trigger-jobs: ''
-
+    robot-options: ""