Merge "Improve branch cutting scripts"

[releng/builder.git] / jjb / openflowplugin / openflowplugin-csit-restconf-clustering-perf-daily.yaml

diff --git a/jjb/openflowplugin/openflowplugin-csit-restconf-clustering-perf-daily.yaml b/jjb/openflowplugin/openflowplugin-csit-restconf-clustering-perf-daily.yaml
index 7fe6ed19de7eef3152a082b3c92874679c899184..c89469899b85a7fe5682b3f5e92d02d1e9a3f3a5 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-restconf-clustering-perf-daily.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-restconf-clustering-perf-daily.yaml
@@ -12,12 +12,20 @@
 
     # Project branches
     stream:
-      - carbon:
+      - oxygen:
           branch: 'master'
           jre: 'openjdk8'
+      - nitrogen:
+          branch: 'stable/nitrogen'
+          jre: 'openjdk8'
+      - carbon:
+          branch: 'stable/carbon'
+          jre: 'openjdk8'
+          karaf-version: karaf3
       - boron:
           branch: 'stable/boron'
           jre: 'openjdk8'
+          karaf-version: karaf3
 
     install:
       - only:
@@ -25,11 +33,11 @@
 
     # Job images
     odl_system_flavor: 8 GB General Purpose v1
-    tools_system_image: Ubuntu 14.04 - mininet-ovs-25 - 20170210-0300
+    tools_system_image: Ubuntu 16.04 - mininet-ovs-25 - 20170808-0158
 
     # Features to install
     install-features: >
-        odl-openflowplugin-flow-services-ui,
+        odl-openflowplugin-flow-services-rest,
         odl-jolokia,
         decanter-collector-jmx,
         decanter-appender-elasticsearch