Merge "Use lf-infra-parameters"

[releng/builder.git] / jjb / openflowplugin / openflowplugin-csit-scale-stats-collection-daily.yaml

diff --git a/jjb/openflowplugin/openflowplugin-csit-scale-stats-collection-daily.yaml b/jjb/openflowplugin/openflowplugin-csit-scale-stats-collection-daily.yaml
index 68703fc769e310a56b6426c252288a385983e02b..17c1513db039d6887472857e2520cbc2f4545167 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-scale-stats-collection-daily.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-scale-stats-collection-daily.yaml
@@ -14,12 +14,17 @@
 
     # Project branches
     stream:
-      - carbon:
+      - nitrogen:
           branch: 'master'
           jre: 'openjdk8'
+      - carbon:
+          branch: 'stable/carbon'
+          jre: 'openjdk8'
+          karaf-version: karaf3
       - boron:
           branch: 'stable/boron'
           jre: 'openjdk8'
+          karaf-version: karaf3
 
     install:
       - only:
@@ -27,10 +32,10 @@
 
     # 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 - 20170703-2150'
 
     # Features to install
-    install-features: 'odl-openflowplugin-flow-services-ui'
+    install-features: 'odl-openflowplugin-flow-services-rest'
 
     # Robot custom options
     robot-options: '-v flnr:100000 -v swnr:32 -v fpr:200'