Merge "Update CentOS 7 devstack Ocata image"

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

diff --git a/jjb/openflowplugin/openflowplugin-csit-bulkomatic-clustering-perf-daily.yaml b/jjb/openflowplugin/openflowplugin-csit-bulkomatic-clustering-perf-daily.yaml
index 3d751e6ec69c4ec9c858d6aa07ce73a5bf3c2ac9..56b37cb5e0f22902fd6e569d640ce5b9398f0fae 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-bulkomatic-clustering-perf-daily.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-bulkomatic-clustering-perf-daily.yaml
@@ -14,16 +14,12 @@
 
     # Project branches
     stream:
-      - nitrogen:
+      - oxygen:
           branch: 'master'
-          jre: 'openjdk8'
+      - nitrogen:
+          branch: 'stable/nitrogen'
       - carbon:
           branch: 'stable/carbon'
-          jre: 'openjdk8'
-          karaf-version: karaf3
-      - boron:
-          branch: 'stable/boron'
-          jre: 'openjdk8'
           karaf-version: karaf3
 
     install:
@@ -32,11 +28,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 - 20171016-0212'
 
     # 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,