Merge "Change Netconf Testtool version"

[releng/builder.git] / jjb / controller / controller-csit-rest-clust-cars-perf.yaml

diff --git a/jjb/controller/controller-csit-rest-clust-cars-perf.yaml b/jjb/controller/controller-csit-rest-clust-cars-perf.yaml
index a5769964d40859c99d6e6907886c80ee347c1695..cc683e28a3f55fbcfe453d9c74138df2fb10b5e3 100644 (file)
--- a/jjb/controller/controller-csit-rest-clust-cars-perf.yaml
+++ b/jjb/controller/controller-csit-rest-clust-cars-perf.yaml
@@ -2,35 +2,36 @@
 - project:
     name: controller-csit-rest-clust-cars-perf
     jobs:
-      - '{project}-csit-3node-{functionality}-{install}-{stream}'
+      - inttest-csit-3node
 
     # The project name
-    project: 'controller'
+    project: "controller"
 
     # The functionality under test
-    functionality: 'rest-clust-cars-perf'
+    functionality:
+      - "rest-clust-cars-perf-ask"
+      - "rest-clust-cars-perf-tell"
 
     # 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:
       - only:
-          scope: 'only'
+          scope: "only"
 
     # Features to install
     install-features: >
-        odl-restconf,
-        odl-clustering-test-app
+      odl-restconf,
+      odl-clustering-test-app
 
     # Robot custom options
-    robot-options: ''
+    robot-options: ""