Adjust Cbench jobs for 2 CPUs controller VM

Change-Id: I948cc9d449b902d117b67750df0ca7db223f0282
Signed-off-by: Luis Gomez <ecelgp@gmail.com>

diff --git a/jjb/openflowplugin/openflowplugin-csit-cbench-daily-helium-redesign.yaml b/jjb/openflowplugin/openflowplugin-csit-cbench-daily-helium-redesign.yaml
index 667e8436feaf7877419a68820d3d345fc3e4f4ae..2f9275f3583715409a9175720b82c97de739b51f 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-cbench-daily-helium-redesign.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-cbench-daily-helium-redesign.yaml
@@ -23,7 +23,7 @@
     install-features: 'odl-openflowplugin-flow-services-ui-he,odl-openflowplugin-drop-test-he'
 
     # Robot custom options
-    robot-options: '-v duration_in_secs:180'
+    robot-options: '-v duration_in_secs:180 -v throughput_threshold:20000 -v latency_threshold:5000'
 
     # Trigger jobs (daily)
     schedule: 'H H * * *'

diff --git a/jjb/openflowplugin/openflowplugin-csit-cbench-daily-lithium-redesign-old.yaml b/jjb/openflowplugin/openflowplugin-csit-cbench-daily-lithium-redesign-old.yaml
index 5bac31ee356402ed73f83c95a302a1fc9ab61ed3..285c7aabe84b7625abde5010c88b0a8d4832eca9 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-cbench-daily-lithium-redesign-old.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-cbench-daily-lithium-redesign-old.yaml
@@ -26,7 +26,7 @@
     install-features: 'odl-openflowplugin-flow-services-ui-li,odl-openflowplugin-drop-test-li'
 
     # Robot custom options
-    robot-options: '-v duration_in_secs:180'
+    robot-options: '-v duration_in_secs:180 -v throughput_threshold:20000 -v latency_threshold:5000'
 
     # Trigger jobs (daily)
     schedule: 'H H * * *'

diff --git a/jjb/openflowplugin/openflowplugin-csit-cbench-daily-old.yaml b/jjb/openflowplugin/openflowplugin-csit-cbench-daily-old.yaml
index f2c3cfea4be22ed8d0edc5035bd4a0a2cd1eaacb..baf14a29bd5209d28b46f902ba8b7dfbfe148fb2 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-cbench-daily-old.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-cbench-daily-old.yaml
@@ -26,7 +26,7 @@
     install-features: 'odl-openflowplugin-flow-services-ui,odl-openflowplugin-drop-test'
 
     # Robot custom options
-    robot-options: '-v duration_in_secs:180'
+    robot-options: '-v duration_in_secs:180 -v throughput_threshold:20000 -v latency_threshold:5000'
 
     # Trigger jobs (daily)
     schedule: 'H H * * *'

diff --git a/jjb/openflowplugin/openflowplugin-csit-cbench-daily.yaml b/jjb/openflowplugin/openflowplugin-csit-cbench-daily.yaml
index 9ceba23d0744a94ea0e4b5bd38fbec490a1c2e19..e3ab2cc510eb80370053c0b1ef265502d0145c21 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-cbench-daily.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-cbench-daily.yaml
@@ -23,7 +23,7 @@
     install-features: 'odl-openflowplugin-flow-services-ui,odl-openflowplugin-drop-test'
 
     # Robot custom options
-    robot-options: '-v duration_in_secs:180'
+    robot-options: '-v duration_in_secs:180 -v throughput_threshold:20000 -v latency_threshold:5000'
 
     # Trigger jobs (daily)
     schedule: 'H H * * *'

diff --git a/jjb/openflowplugin/openflowplugin-csit-cbench-performance-helium-redesign.yaml b/jjb/openflowplugin/openflowplugin-csit-cbench-performance-helium-redesign.yaml
index 4688fe629700979f00735ab409f4a863bd630790..7185b67ffa165ac5df5f56105d5f28afa41469a8 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-cbench-performance-helium-redesign.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-cbench-performance-helium-redesign.yaml
@@ -23,7 +23,7 @@
     install-features: 'odl-openflowplugin-flow-services-ui-he,odl-openflowplugin-drop-test-he'
 
     # Robot custom options
-    robot-options: ''
+    robot-options: '-v throughput_threshold:20000 -v latency_threshold:5000'
 
     # Trigger jobs (upstream dependencies)
     trigger-jobs: 'yangtools-distribution-{stream},controller-distribution-{stream},openflowjava-distribution-{stream},openflowplugin-distribution-{stream}'

diff --git a/jjb/openflowplugin/openflowplugin-csit-cbench-performance-lithium-redesign-old.yaml b/jjb/openflowplugin/openflowplugin-csit-cbench-performance-lithium-redesign-old.yaml
index f4782b4af4bf585c226fb976511afd9b049a5be0..580a5afc86222d0e55b6fc43cbe8f7522b4b876c 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-cbench-performance-lithium-redesign-old.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-cbench-performance-lithium-redesign-old.yaml
@@ -26,7 +26,7 @@
     install-features: 'odl-openflowplugin-flow-services-ui-li,odl-openflowplugin-drop-test-li'
 
     # Robot custom options
-    robot-options: ''
+    robot-options: '-v throughput_threshold:20000 -v latency_threshold:5000'
 
     # Trigger jobs (upstream dependencies)
     trigger-jobs: 'yangtools-distribution-{stream},controller-distribution-{stream},openflowjava-distribution-{stream},openflowplugin-distribution-{stream}'

diff --git a/jjb/openflowplugin/openflowplugin-csit-cbench-performance-old.yaml b/jjb/openflowplugin/openflowplugin-csit-cbench-performance-old.yaml
index 365ed21932b19e5a9755bf0aac1327caf39f49ea..e6d06b4d6fd72db6c7171c78053697c9d4698029 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-cbench-performance-old.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-cbench-performance-old.yaml
@@ -26,7 +26,7 @@
     install-features: 'odl-openflowplugin-flow-services-ui,odl-openflowplugin-drop-test'
 
     # Robot custom options
-    robot-options: ''
+    robot-options: '-v throughput_threshold:20000 -v latency_threshold:5000'
 
     # Trigger jobs (upstream dependencies)
     trigger-jobs: 'yangtools-distribution-{stream},controller-distribution-{stream},openflowjava-distribution-{stream},openflowplugin-distribution-{stream}'

diff --git a/jjb/openflowplugin/openflowplugin-csit-cbench-performance.yaml b/jjb/openflowplugin/openflowplugin-csit-cbench-performance.yaml
index 88f52246e6ba015685f4b2043074a80bfa91c441..ff8bd6570b38387e2b8db9127c44bf9b44b5c301 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-cbench-performance.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-cbench-performance.yaml
@@ -23,7 +23,7 @@
     install-features: 'odl-openflowplugin-flow-services-ui,odl-openflowplugin-drop-test'
 
     # Robot custom options
-    robot-options: ''
+    robot-options: '-v throughput_threshold:20000 -v latency_threshold:5000'
 
     # Trigger jobs (upstream dependencies)
     trigger-jobs: 'yangtools-distribution-{stream},controller-distribution-{stream},openflowjava-distribution-{stream},openflowplugin-distribution-{stream}'