Merge "Update cloud image list docs"

[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 8710a4602bf3a035d75cd6db96df0a52621dc397..8daba62ce227f1e056e83524c855981b20eb54cf 100644 (file)
--- a/jjb/controller/controller-csit-rest-clust-cars-perf.yaml
+++ b/jjb/controller/controller-csit-rest-clust-cars-perf.yaml
@@ -2,31 +2,27 @@
 - project:
     name: controller-csit-rest-clust-cars-perf
     jobs:
-      - '{project}-csit-3node-{functionality}-{install}-{stream}'
+      - inttest-csit-3node
 
     # The project name
     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:
-      - nitrogen:
+      - sodium:
           branch: 'master'
-          jre: 'openjdk8'
-      - carbon:
-          branch: 'stable/carbon'
-          jre: 'openjdk8'
-          karaf-version: karaf3
-      - boron:
-          branch: 'stable/boron'
-          jre: 'openjdk8'
-          karaf-version: karaf3
-      - beryllium:
-          branch: 'stable/beryllium'
-          jre: 'openjdk7'
-          karaf-version: karaf3
+      - neon:
+          branch: 'stable/neon'
+      - fluorine:
+          branch: 'stable/fluorine'
+      - oxygen:
+          branch: 'stable/oxygen'
+          disable-job: 'true'
 
     install:
       - only: