Merge "OFP test adjustments"

diff --git a/jjb/openflowplugin/openflowplugin-csit-longevity.yaml b/jjb/openflowplugin/openflowplugin-csit-longevity.yaml
index 9cdddc543add1206d93c676a4d7afe373ce05e6c..4179e504454712cb6daf939953fcb0e6f33902b6 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-longevity.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-longevity.yaml
@@ -36,4 +36,4 @@
         decanter-appender-elasticsearch
 
     # Robot custom options
-    robot-options: '-v TEST_LENGTH:23h'
+    robot-options: '-v TEST_LENGTH:23h -v NUM_SWITCHES:16'

diff --git a/jjb/openflowplugin/openflowplugin-csit-scale-switch.yaml b/jjb/openflowplugin/openflowplugin-csit-scale-switch.yaml
index e7ae4f40ba56b8d2610660e72a2083661890fc59..e25dde647bb5f92d1e0183fd9a58335236baf456 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-scale-switch.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-scale-switch.yaml
@@ -25,7 +25,9 @@
           scope: 'only'
 
     # Job images
+    odl_system_flavor: 'v1-performance-4'
     tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-26 - 20171208-1847'
+    tools_system_flavor: 'v1-performance-2'
 
     # Features to install
     install-features: >