Merge "Add pike combo to carbon and nitrogen jobs"

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

diff --git a/jjb/openflowplugin/openflowplugin-csit-bulkomatic-perf-daily.yaml b/jjb/openflowplugin/openflowplugin-csit-bulkomatic-perf-daily.yaml
index 5bfe2e28b32a7cd22e8aaf852c79d52156e58544..55644fe52110798fbd603a006115e8616fe14525 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-bulkomatic-perf-daily.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-bulkomatic-perf-daily.yaml
@@ -14,12 +14,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:
@@ -27,11 +35,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-openflowplugin-app-bulk-o-matic,
         odl-jolokia,
         decanter-collector-jmx,