Merge "Clean up and rename OF CSIT jobs"

[releng/builder.git] / jjb / controller / controller-csit-periodic-dsbenchmark.yaml

diff --git a/jjb/controller/controller-csit-periodic-dsbenchmark.yaml b/jjb/controller/controller-csit-periodic-dsbenchmark.yaml
index 1c67a74431a99f9c9ec8f337cd962893c40336c1..4b47661a53cfc30239b07231d93246753bc838c4 100644 (file)
--- a/jjb/controller/controller-csit-periodic-dsbenchmark.yaml
+++ b/jjb/controller/controller-csit-periodic-dsbenchmark.yaml
@@ -12,24 +12,23 @@
 
     # 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-mdsal-benchmark,odl-jolokia'
+    install-features: >
+        odl-restconf,
+        odl-mdsal-benchmark,
+        odl-jolokia
 
     # Robot custom options
     robot-options: '--exclude clustered_setup'