Switch the csit-1node to use job prefix

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

diff --git a/jjb/controller/controller-csit-rest-cars-perf.yaml b/jjb/controller/controller-csit-rest-cars-perf.yaml
index 96d3eceecb1192f27390345994d01e4d1d907b8e..9b68e7d05f3977663c8eb29de0928bc766caeae6 100644 (file)
--- a/jjb/controller/controller-csit-rest-cars-perf.yaml
+++ b/jjb/controller/controller-csit-rest-cars-perf.yaml
@@ -2,7 +2,7 @@
 - project:
     name: controller-csit-rest-cars-perf
     jobs:
-      - '{project}-csit-1node-{functionality}-{install}-{stream}'
+      - inttest-csit-1node
 
     # The project name
     project: 'controller'
@@ -12,24 +12,22 @@
 
     # Project branches
     stream:
-      - carbon:
+      - oxygen:
           branch: 'master'
-          jre: 'openjdk8'
-      - boron:
-          branch: 'stable/boron'
-          jre: 'openjdk8'
-      - beryllium:
-          branch: 'stable/beryllium'
-          jre: 'openjdk7'
+      - nitrogen:
+          branch: 'stable/nitrogen'
+      - carbon:
+          branch: 'stable/carbon'
+          karaf-version: karaf3
 
     install:
-      - only:
-          scope: 'only'
       - all:
           scope: 'all'
 
     # Features to install
-    install-features: 'odl-restconf,odl-clustering-test-app'
+    install-features: >
+        odl-restconf,
+        odl-clustering-test-app
 
     # Robot custom options
     robot-options: ''