Reorganize jobs for OF plugin swap

- In master add helium-redesign label for He plugin jobs.
- Also some jjb code cleanup.

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

diff --git a/jjb/openflowplugin/openflowplugin-csit-bulk-matic-ds-daily-helium-redesign.yaml b/jjb/openflowplugin/openflowplugin-csit-bulk-matic-ds-daily-helium-redesign.yaml
new file mode 100644 (file)
index 0000000..5ac84c9
--- /dev/null
+++ b/jjb/openflowplugin/openflowplugin-csit-bulk-matic-ds-daily-helium-redesign.yaml
@@ -0,0 +1,35 @@
+- project:
+    name: openflowplugin-csit-bulk-matic-ds-daily-helium-redesign
+    jobs:
+        - '{project}-csit-1node-periodic-{functionality}-{install}-{stream}'
+
+    # The project name
+    project: 'openflowplugin'
+
+    # The functionality under test
+    functionality: 'bulk-matic-ds-daily-helium-redesign'
+
+    # Project branches
+    stream:
+        - boron:
+            branch: 'master'
+            jre: 'openjdk8'
+
+    install:
+        - only:
+            scope: 'only'
+
+    # Features to install
+    install-features: 'odl-openflowplugin-flow-services-ui-he,odl-openflowplugin-app-bulk-o-matic-he'
+
+    # Robot custom options
+    robot-options: ''
+
+    # Trigger jobs (daily)
+    schedule: 'H H * * *'
+
+    # Plot Info
+    01-plot-title: 'REST setup rate (for 100k flows)'
+    01-plot-yaxis: 'setup time[s], req[flows/s]'
+    01-plot-group: 'Performance Rate'
+    01-plot-data-file: 'flows_setup_time.csv'

diff --git a/jjb/openflowplugin/openflowplugin-csit-bulk-matic-ds-daily-lithium-redesign.yaml b/jjb/openflowplugin/openflowplugin-csit-bulk-matic-ds-daily-lithium-redesign-old.yaml
similarity index 92%
rename from jjb/openflowplugin/openflowplugin-csit-bulk-matic-ds-daily-lithium-redesign.yaml
rename to jjb/openflowplugin/openflowplugin-csit-bulk-matic-ds-daily-lithium-redesign-old.yaml
index 56b0eff55fefc0ffee770d6b5b85287d0d74bd66..90dc624655d99e7180bdef045a8a51f27b32bd70 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-bulk-matic-ds-daily-lithium-redesign.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-bulk-matic-ds-daily-lithium-redesign-old.yaml
@@ -1,5 +1,5 @@
 - project:
-    name: openflowplugin-csit-bulk-matic-ds-daily-lithium-redesign
+    name: openflowplugin-csit-bulk-matic-ds-daily-lithium-redesign-old
     jobs:
         - '{project}-csit-1node-periodic-{functionality}-{install}-{stream}'
 
@@ -11,9 +11,6 @@
 
     # Project branches
     stream:
-        - boron:
-            branch: 'master'
-            jre: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
             jre: 'openjdk7'

diff --git a/jjb/openflowplugin/openflowplugin-csit-bulk-matic-ds-daily-old.yaml b/jjb/openflowplugin/openflowplugin-csit-bulk-matic-ds-daily-old.yaml
new file mode 100644 (file)
index 0000000..39a8a7b
--- /dev/null
+++ b/jjb/openflowplugin/openflowplugin-csit-bulk-matic-ds-daily-old.yaml
@@ -0,0 +1,38 @@
+- project:
+    name: openflowplugin-csit-bulk-matic-ds-daily-old
+    jobs:
+        - '{project}-csit-1node-periodic-{functionality}-{install}-{stream}'
+
+    # The project name
+    project: 'openflowplugin'
+
+    # The functionality under test
+    functionality: 'bulk-matic-ds-daily'
+
+    # Project branches
+    stream:
+        - beryllium:
+            branch: 'stable/beryllium'
+            jre: 'openjdk7'
+        - stable-lithium:
+            branch: 'stable/lithium'
+            jre: 'openjdk7'
+
+    install:
+        - only:
+            scope: 'only'
+
+    # Features to install
+    install-features: 'odl-openflowplugin-flow-services-ui,odl-openflowplugin-app-bulk-o-matic'
+
+    # Robot custom options
+    robot-options: ''
+
+    # Trigger jobs (daily)
+    schedule: 'H H * * *'
+
+    # Plot Info
+    01-plot-title: 'REST setup rate (for 100k flows)'
+    01-plot-yaxis: 'setup time[s], req[flows/s]'
+    01-plot-group: 'Performance Rate'
+    01-plot-data-file: 'flows_setup_time.csv'

diff --git a/jjb/openflowplugin/openflowplugin-csit-bulk-matic-ds-daily.yaml b/jjb/openflowplugin/openflowplugin-csit-bulk-matic-ds-daily.yaml
index e45758690ab97c2a0d1906e0eb47a81e708eefcd..132f499a1d75d38829d06d6d2cf2d17cfed18ad1 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-bulk-matic-ds-daily.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-bulk-matic-ds-daily.yaml
@@ -14,12 +14,6 @@
         - boron:
             branch: 'master'
             jre: 'openjdk8'
-        - beryllium:
-            branch: 'stable/beryllium'
-            jre: 'openjdk7'
-        - stable-lithium:
-            branch: 'stable/lithium'
-            jre: 'openjdk7'
 
     install:
         - only:

diff --git a/jjb/openflowplugin/openflowplugin-csit-bulkomatic-clustering-daily-helium-redesign.yaml b/jjb/openflowplugin/openflowplugin-csit-bulkomatic-clustering-daily-helium-redesign.yaml
new file mode 100644 (file)
index 0000000..2676976
--- /dev/null
+++ b/jjb/openflowplugin/openflowplugin-csit-bulkomatic-clustering-daily-helium-redesign.yaml
@@ -0,0 +1,33 @@
+- project:
+    name: openflowplugin-csit-bulkomatic-clustering-daily-helium-redesign
+    jobs:
+        - '{project}-csit-3node-periodic-{functionality}-{install}-{stream}'
+
+    # The project name
+    project: 'openflowplugin'
+
+    # The functionality under test
+    functionality: 'bulkomatic-clustering-daily-helium-redesign'
+
+    # Project branches
+    stream:
+        - boron:
+            branch: 'master'
+            jre: 'openjdk8'
+
+    install:
+        - only:
+            scope: 'only'
+
+    # Features to install
+    install-features: 'odl-openflowplugin-flow-services-ui-he,odl-openflowplugin-app-bulk-o-matic-he'
+
+    # Robot custom options
+    robot-options: '-v ODL_OF_PLUGIN:helium'
+
+    # Trigger jobs (daily)
+    schedule: 'H H * * *'
+
+    # 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-bulkomatic-clustering-daily-lithium-redesign-old.yaml b/jjb/openflowplugin/openflowplugin-csit-bulkomatic-clustering-daily-lithium-redesign-old.yaml
new file mode 100644 (file)
index 0000000..0357e30
--- /dev/null
+++ b/jjb/openflowplugin/openflowplugin-csit-bulkomatic-clustering-daily-lithium-redesign-old.yaml
@@ -0,0 +1,33 @@
+- project:
+    name: openflowplugin-csit-bulkomatic-clustering-daily-lithium-redesign-old
+    jobs:
+        - '{project}-csit-3node-periodic-{functionality}-{install}-{stream}'
+
+    # The project name
+    project: 'openflowplugin'
+
+    # The functionality under test
+    functionality: 'bulkomatic-clustering-daily-lithium-redesign'
+
+    # Project branches
+    stream:
+        - beryllium:
+            branch: 'stable/beryllium'
+            jre: 'openjdk7'
+
+    install:
+        - only:
+            scope: 'only'
+
+    # Features to install
+    install-features: 'odl-openflowplugin-flow-services-ui-li,odl-openflowplugin-app-bulk-o-matic-li'
+
+    # Robot custom options
+    robot-options: '-v ODL_OF_PLUGIN:lithium'
+
+    # Trigger jobs (daily)
+    schedule: 'H H * * *'
+
+    # 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-bulkomatic-clustering-daily-old.yaml b/jjb/openflowplugin/openflowplugin-csit-bulkomatic-clustering-daily-old.yaml
new file mode 100644 (file)
index 0000000..ef9a6c6
--- /dev/null
+++ b/jjb/openflowplugin/openflowplugin-csit-bulkomatic-clustering-daily-old.yaml
@@ -0,0 +1,33 @@
+- project:
+    name: openflowplugin-csit-bulkomatic-clustering-daily-old
+    jobs:
+        - '{project}-csit-3node-periodic-{functionality}-{install}-{stream}'
+
+    # The project name
+    project: 'openflowplugin'
+
+    # The functionality under test
+    functionality: 'bulkomatic-clustering-daily'
+
+    # Project branches
+    stream:
+        - beryllium:
+            branch: 'stable/beryllium'
+            jre: 'openjdk7'
+
+    install:
+        - only:
+            scope: 'only'
+
+    # Features to install
+    install-features: 'odl-openflowplugin-flow-services-ui,odl-openflowplugin-app-bulk-o-matic'
+
+    # Robot custom options
+    robot-options: '-v ODL_OF_PLUGIN:helium'
+
+    # Trigger jobs (daily)
+    schedule: 'H H * * *'
+
+    # 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-bulkomatic-clustering-daily.yaml b/jjb/openflowplugin/openflowplugin-csit-bulkomatic-clustering-daily.yaml
index cd66ab249e7dc622535b8964d4275391db0aa968..6d3308c75609b93c2b62b2e87771670e081d38df 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-bulkomatic-clustering-daily.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-bulkomatic-clustering-daily.yaml
@@ -14,16 +14,13 @@
         - boron:
             branch: 'master'
             jre: 'openjdk8'
-        - beryllium:
-            branch: 'stable/beryllium'
-            jre: 'openjdk7'
 
     install:
         - only:
             scope: 'only'
 
     # Features to install
-    install-features: 'odl-openflowplugin-flow-services-ui-li,odl-openflowplugin-app-bulk-o-matic-li'
+    install-features: 'odl-openflowplugin-flow-services-ui,odl-openflowplugin-app-bulk-o-matic'
 
     # Robot custom options
     robot-options: '-v ODL_OF_PLUGIN:lithium'

diff --git a/jjb/openflowplugin/openflowplugin-csit-cbench-daily-helium-redesign.yaml b/jjb/openflowplugin/openflowplugin-csit-cbench-daily-helium-redesign.yaml
new file mode 100644 (file)
index 0000000..f26fc22
--- /dev/null
+++ b/jjb/openflowplugin/openflowplugin-csit-cbench-daily-helium-redesign.yaml
@@ -0,0 +1,42 @@
+- project:
+    name: openflowplugin-csit-cbench-helium-redesign-daily
+    jobs:
+        - '{project}-csit-1node-periodic-{functionality}-{install}-{stream}'
+
+    # The project name
+    project: 'openflowplugin'
+
+    # The functionality under test
+    functionality: 'cbench-daily-helium-redesign'
+
+    # Project branches
+    stream:
+        - boron:
+            branch: 'master'
+            jre: 'openjdk8'
+
+    install:
+        - only:
+            scope: 'only'
+
+    # Features to install
+    install-features: 'odl-openflowplugin-flow-services-ui-he,odl-openflowplugin-drop-test-he'
+
+    # Mininet configuration
+    mininet-image: 'rk-c-el6-mininet'
+
+    # Robot custom options
+    robot-options: '-v duration_in_secs:180'
+
+    # Trigger jobs (daily)
+    schedule: 'H H * * *'
+
+    # Plot Info
+    01-plot-title: 'Throughput Mode'
+    01-plot-yaxis: 'flow_mods/sec'
+    01-plot-group: 'Cbench Performance'
+    01-plot-data-file: 'throughput.csv'
+    02-plot-title: 'Latency Mode'
+    02-plot-yaxis: 'flow_mods/sec'
+    02-plot-group: 'Cbench Performance'
+    02-plot-data-file: 'latency.csv'

diff --git a/jjb/openflowplugin/openflowplugin-csit-cbench-daily-lithium-redesign-old.yaml b/jjb/openflowplugin/openflowplugin-csit-cbench-daily-lithium-redesign-old.yaml
new file mode 100644 (file)
index 0000000..8a91c74
--- /dev/null
+++ b/jjb/openflowplugin/openflowplugin-csit-cbench-daily-lithium-redesign-old.yaml
@@ -0,0 +1,45 @@
+- project:
+    name: openflowplugin-csit-cbench-daily-lithium-redesign-old
+    jobs:
+        - '{project}-csit-1node-periodic-{functionality}-{install}-{stream}'
+
+    # The project name
+    project: 'openflowplugin'
+
+    # The functionality under test
+    functionality: 'cbench-daily-lithium-redesign'
+
+    # Project branches
+    stream:
+        - beryllium:
+            branch: 'stable/beryllium'
+            jre: 'openjdk7'
+        - stable-lithium:
+            branch: 'stable/lithium'
+            jre: 'openjdk7'
+
+    install:
+        - only:
+            scope: 'only'
+
+    # Features to install
+    install-features: 'odl-openflowplugin-flow-services-ui-li,odl-openflowplugin-drop-test-li'
+
+    # Mininet configuration
+    mininet-image: 'rk-c-el6-mininet'
+
+    # Robot custom options
+    robot-options: '-v duration_in_secs:180'
+
+    # Trigger jobs (daily)
+    schedule: 'H H * * *'
+
+    # Plot Info
+    01-plot-title: 'Throughput Mode'
+    01-plot-yaxis: 'flow_mods/sec'
+    01-plot-group: 'Cbench Performance'
+    01-plot-data-file: 'throughput.csv'
+    02-plot-title: 'Latency Mode'
+    02-plot-yaxis: 'flow_mods/sec'
+    02-plot-group: 'Cbench Performance'
+    02-plot-data-file: 'latency.csv'

diff --git a/jjb/openflowplugin/openflowplugin-csit-cbench-daily-old.yaml b/jjb/openflowplugin/openflowplugin-csit-cbench-daily-old.yaml
new file mode 100644 (file)
index 0000000..f645055
--- /dev/null
+++ b/jjb/openflowplugin/openflowplugin-csit-cbench-daily-old.yaml
@@ -0,0 +1,45 @@
+- project:
+    name: openflowplugin-csit-cbench-daily-old
+    jobs:
+        - '{project}-csit-1node-periodic-{functionality}-{install}-{stream}'
+
+    # The project name
+    project: 'openflowplugin'
+
+    # The functionality under test
+    functionality: 'cbench-daily'
+
+    # Project branches
+    stream:
+        - beryllium:
+            branch: 'stable/beryllium'
+            jre: 'openjdk7'
+        - stable-lithium:
+            branch: 'stable/lithium'
+            jre: 'openjdk7'
+
+    install:
+        - only:
+            scope: 'only'
+
+    # Features to install
+    install-features: 'odl-openflowplugin-flow-services-ui,odl-openflowplugin-drop-test'
+
+    # Mininet configuration
+    mininet-image: 'rk-c-el6-mininet'
+
+    # Robot custom options
+    robot-options: '-v duration_in_secs:180'
+
+    # Trigger jobs (daily)
+    schedule: 'H H * * *'
+
+    # Plot Info
+    01-plot-title: 'Throughput Mode'
+    01-plot-yaxis: 'flow_mods/sec'
+    01-plot-group: 'Cbench Performance'
+    01-plot-data-file: 'throughput.csv'
+    02-plot-title: 'Latency Mode'
+    02-plot-yaxis: 'flow_mods/sec'
+    02-plot-group: 'Cbench Performance'
+    02-plot-data-file: 'latency.csv'

diff --git a/jjb/openflowplugin/openflowplugin-csit-cbench-daily.yaml b/jjb/openflowplugin/openflowplugin-csit-cbench-daily.yaml
index cb9bd797fd9697e949c550fc64f189c3e4a3e3ab..2b2fa052a06f096e06faa1273319f68d997c30e1 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-cbench-daily.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-cbench-daily.yaml
@@ -14,12 +14,6 @@
         - boron:
             branch: 'master'
             jre: 'openjdk8'
-        - beryllium:
-            branch: 'stable/beryllium'
-            jre: 'openjdk7'
-        - stable-lithium:
-            branch: 'stable/lithium'
-            jre: 'openjdk7'
 
     install:
         - only:

diff --git a/jjb/openflowplugin/openflowplugin-csit-cbench-performance-helium-redesign.yaml b/jjb/openflowplugin/openflowplugin-csit-cbench-performance-helium-redesign.yaml
new file mode 100644 (file)
index 0000000..ad37b99
--- /dev/null
+++ b/jjb/openflowplugin/openflowplugin-csit-cbench-performance-helium-redesign.yaml
@@ -0,0 +1,42 @@
+- project:
+    name: openflowplugin-csit-cbench-performance-helium-redesign
+    jobs:
+        - '{project}-csit-1node-{functionality}-{install}-{stream}'
+
+    # The project name
+    project: 'openflowplugin'
+
+    # The functionality under test
+    functionality: 'cbench-performance-helium-redesign'
+
+    # Project branches
+    stream:
+        - boron:
+            branch: 'master'
+            jre: 'openjdk8'
+
+    install:
+        - only:
+            scope: 'only'
+
+    # Features to install
+    install-features: 'odl-openflowplugin-flow-services-ui-he,odl-openflowplugin-drop-test-he'
+
+    # Mininet configuration
+    mininet-image: 'rk-c-el6-mininet'
+
+    # Robot custom options
+    robot-options: ''
+
+    # Trigger jobs (upstream dependencies)
+    trigger-jobs: 'yangtools-distribution-{stream},controller-distribution-{stream},openflowjava-distribution-{stream},openflowplugin-distribution-{stream}'
+
+    # Plot Info
+    01-plot-title: 'Throughput Mode'
+    01-plot-yaxis: 'flow_mods/sec'
+    01-plot-group: 'Cbench Performance'
+    01-plot-data-file: 'throughput.csv'
+    02-plot-title: 'Latency Mode'
+    02-plot-yaxis: 'flow_mods/sec'
+    02-plot-group: 'Cbench Performance'
+    02-plot-data-file: 'latency.csv'

diff --git a/jjb/openflowplugin/openflowplugin-csit-cbench-performance-lithium-redesign.yaml b/jjb/openflowplugin/openflowplugin-csit-cbench-performance-lithium-redesign-old.yaml
similarity index 94%
rename from jjb/openflowplugin/openflowplugin-csit-cbench-performance-lithium-redesign.yaml
rename to jjb/openflowplugin/openflowplugin-csit-cbench-performance-lithium-redesign-old.yaml
index 8cce14c4cc7f79367551ca05d98fd82d3b98176b..2d00ad51dc4c392bb132efe79aacd1fb067866f5 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-cbench-performance-lithium-redesign.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-cbench-performance-lithium-redesign-old.yaml
@@ -1,5 +1,5 @@
 - project:
-    name: openflowplugin-csit-cbench-performance-lithium-redesign
+    name: openflowplugin-csit-cbench-performance-lithium-redesign-old
     jobs:
         - '{project}-csit-1node-{functionality}-{install}-{stream}'
 
@@ -11,9 +11,6 @@
 
     # Project branches
     stream:
-        - boron:
-            branch: 'master'
-            jre: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
             jre: 'openjdk7'

diff --git a/jjb/openflowplugin/openflowplugin-csit-cbench-performance-old.yaml b/jjb/openflowplugin/openflowplugin-csit-cbench-performance-old.yaml
new file mode 100644 (file)
index 0000000..bd09505
--- /dev/null
+++ b/jjb/openflowplugin/openflowplugin-csit-cbench-performance-old.yaml
@@ -0,0 +1,45 @@
+- project:
+    name: openflowplugin-csit-cbench-performance-old
+    jobs:
+        - '{project}-csit-1node-{functionality}-{install}-{stream}'
+
+    # The project name
+    project: 'openflowplugin'
+
+    # The functionality under test
+    functionality: 'cbench-performance'
+
+    # Project branches
+    stream:
+        - beryllium:
+            branch: 'stable/beryllium'
+            jre: 'openjdk7'
+        - stable-lithium:
+            branch: 'stable/lithium'
+            jre: 'openjdk7'
+
+    install:
+        - only:
+            scope: 'only'
+
+    # Features to install
+    install-features: 'odl-openflowplugin-flow-services-ui,odl-openflowplugin-drop-test'
+
+    # Mininet configuration
+    mininet-image: 'rk-c-el6-mininet'
+
+    # Robot custom options
+    robot-options: ''
+
+    # Trigger jobs (upstream dependencies)
+    trigger-jobs: 'yangtools-distribution-{stream},controller-distribution-{stream},openflowjava-distribution-{stream},openflowplugin-distribution-{stream}'
+
+    # Plot Info
+    01-plot-title: 'Throughput Mode'
+    01-plot-yaxis: 'flow_mods/sec'
+    01-plot-group: 'Cbench Performance'
+    01-plot-data-file: 'throughput.csv'
+    02-plot-title: 'Latency Mode'
+    02-plot-yaxis: 'flow_mods/sec'
+    02-plot-group: 'Cbench Performance'
+    02-plot-data-file: 'latency.csv'

diff --git a/jjb/openflowplugin/openflowplugin-csit-cbench-performance.yaml b/jjb/openflowplugin/openflowplugin-csit-cbench-performance.yaml
index 2967b5d607b64f88ed8b1cc33eaca03c79a4dba3..66f98016991180f09b0bd3f2f49ea602c28d0dfa 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-cbench-performance.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-cbench-performance.yaml
@@ -14,12 +14,6 @@
         - boron:
             branch: 'master'
             jre: 'openjdk8'
-        - beryllium:
-            branch: 'stable/beryllium'
-            jre: 'openjdk7'
-        - stable-lithium:
-            branch: 'stable/lithium'
-            jre: 'openjdk7'
 
     install:
         - only:

diff --git a/jjb/openflowplugin/openflowplugin-csit-clustering-helium-redesign.yaml b/jjb/openflowplugin/openflowplugin-csit-clustering-helium-redesign.yaml
new file mode 100644 (file)
index 0000000..0791296
--- /dev/null
+++ b/jjb/openflowplugin/openflowplugin-csit-clustering-helium-redesign.yaml
@@ -0,0 +1,31 @@
+- project:
+    name: openflowplugin-csit-clustering-helium-redesign
+    jobs:
+        - '{project}-csit-3node-{functionality}-{install}-{stream}'
+        - '{project}-csit-verify-3node-{functionality}'
+
+    # The project name
+    project: 'openflowplugin'
+
+    # The functionality under test
+    functionality: 'clustering-helium-redesign'
+
+    # Project branches
+    stream:
+        - boron:
+            branch: 'master'
+            jre: 'openjdk8'
+
+    install:
+        - only:
+            scope: 'only'
+
+    # Features to install
+    install-features: 'odl-openflowplugin-flow-services-ui-he'
+
+    # Robot custom options
+    robot-options: '-v ODL_OF_PLUGIN:helium'
+
+    # 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-clustering-lithium-redesign-old.yaml b/jjb/openflowplugin/openflowplugin-csit-clustering-lithium-redesign-old.yaml
new file mode 100644 (file)
index 0000000..cb45da9
--- /dev/null
+++ b/jjb/openflowplugin/openflowplugin-csit-clustering-lithium-redesign-old.yaml
@@ -0,0 +1,33 @@
+- project:
+    name: openflowplugin-csit-clustering-lithium-redesign-old
+    jobs:
+        - '{project}-csit-3node-{functionality}-{install}-{stream}'
+
+    # The project name
+    project: 'openflowplugin'
+
+    # The functionality under test
+    functionality: 'clustering-lithium-redesign'
+
+    # Project branches
+    stream:
+        - beryllium:
+            branch: 'stable/beryllium'
+            jre: 'openjdk7'
+        - stable-lithium:
+            branch: 'stable/lithium'
+            jre: 'openjdk7'
+
+    install:
+        - only:
+            scope: 'only'
+
+    # Features to install
+    install-features: 'odl-openflowplugin-flow-services-ui-li'
+
+    # Robot custom options
+    robot-options: '-v ODL_OF_PLUGIN:lithium'
+
+    # 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-clustering-helium-design.yaml b/jjb/openflowplugin/openflowplugin-csit-clustering-old.yaml
similarity index 77%
rename from jjb/openflowplugin/openflowplugin-csit-clustering-helium-design.yaml
rename to jjb/openflowplugin/openflowplugin-csit-clustering-old.yaml
index 311907db0cf5f4952619862076447876ec96526d..1d9d608defa5e5bbc393b07730d770337b52248e 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-clustering-helium-design.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-clustering-old.yaml
@@ -1,20 +1,16 @@
 - project:
-    name: openflowplugin-csit-clustering-helium-design
+    name: openflowplugin-csit-clustering-old
     jobs:
         - '{project}-csit-3node-{functionality}-{install}-{stream}'
-        - '{project}-csit-verify-3node-{functionality}'
 
     # The project name
     project: 'openflowplugin'
 
     # The functionality under test
-    functionality: 'clustering-helium-design'
+    functionality: 'clustering'
 
     # Project branches
     stream:
-        - boron:
-            branch: 'master'
-            jre: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
             jre: 'openjdk7'

diff --git a/jjb/openflowplugin/openflowplugin-csit-clustering.yaml b/jjb/openflowplugin/openflowplugin-csit-clustering.yaml
index 2cf6197f4aa64f7b6de54bac940c9b973f505a9b..634c7821517ad7946f0f3fbfb13fc116f18aeceb 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-clustering.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-clustering.yaml
@@ -15,19 +15,13 @@
         - boron:
             branch: 'master'
             jre: 'openjdk8'
-        - beryllium:
-            branch: 'stable/beryllium'
-            jre: 'openjdk7'
-        - stable-lithium:
-            branch: 'stable/lithium'
-            jre: 'openjdk7'
 
     install:
         - only:
             scope: 'only'
 
     # Features to install
-    install-features: 'odl-openflowplugin-flow-services-ui-li'
+    install-features: 'odl-openflowplugin-flow-services-ui'
 
     # Robot custom options
     robot-options: '-v ODL_OF_PLUGIN:lithium'

diff --git a/jjb/openflowplugin/openflowplugin-csit-config-performance-helium-redesign.yaml b/jjb/openflowplugin/openflowplugin-csit-config-performance-helium-redesign.yaml
new file mode 100644 (file)
index 0000000..ccd1dd4
--- /dev/null
+++ b/jjb/openflowplugin/openflowplugin-csit-config-performance-helium-redesign.yaml
@@ -0,0 +1,40 @@
+- project:
+    name: openflowplugin-csit-config-performance-helium-redesign
+    jobs:
+        - '{project}-csit-1node-{functionality}-{install}-{stream}'
+
+    # The project name
+    project: 'openflowplugin'
+
+    # The functionality under test
+    functionality: 'config-performance-helium-redesign'
+
+    # Project branches
+    stream:
+        - boron:
+            branch: 'master'
+            jre: 'openjdk8'
+
+    install:
+        - only:
+            scope: 'only'
+
+    # Features to install
+    install-features: 'odl-openflowplugin-flow-services-ui-he'
+
+    # Robot custom options
+    robot-options: ''
+
+    # Trigger jobs (upstream dependencies)
+    trigger-jobs: 'yangtools-distribution-{stream},controller-distribution-{stream},openflowjava-distribution-{stream},openflowplugin-distribution-{stream}'
+
+    # Plot Info
+    01-plot-title: 'Flow REST API Rate'
+    01-plot-yaxis: 'http_req/sec'
+    01-plot-group: 'Flow Config Performance'
+    01-plot-data-file: 'rates.csv'
+    02-plot-title: 'Flow Stats Collect Time'
+    02-plot-yaxis: 'seconds'
+    02-plot-group: 'Stats Collect Performance'
+    02-plot-data-file: 'times.csv'
+

diff --git a/jjb/openflowplugin/openflowplugin-csit-config-performance-lithium-redesign.yaml b/jjb/openflowplugin/openflowplugin-csit-config-performance-lithium-redesign-old.yaml
similarity index 94%
rename from jjb/openflowplugin/openflowplugin-csit-config-performance-lithium-redesign.yaml
rename to jjb/openflowplugin/openflowplugin-csit-config-performance-lithium-redesign-old.yaml
index 67ce6f6a84ed76016fe2a2658942da9a175200aa..4489bf9ba35a7061b4e227d9f73122e462ca5230 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-config-performance-lithium-redesign.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-config-performance-lithium-redesign-old.yaml
@@ -1,5 +1,5 @@
 - project:
-    name: openflowplugin-csit-config-performance-lithium-redesign
+    name: openflowplugin-csit-config-performance-lithium-redesign-old
     jobs:
         - '{project}-csit-1node-{functionality}-{install}-{stream}'
 
@@ -11,9 +11,6 @@
 
     # Project branches
     stream:
-        - boron:
-            branch: 'master'
-            jre: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
             jre: 'openjdk7'

diff --git a/jjb/openflowplugin/openflowplugin-csit-config-performance-old.yaml b/jjb/openflowplugin/openflowplugin-csit-config-performance-old.yaml
new file mode 100644 (file)
index 0000000..e520f95
--- /dev/null
+++ b/jjb/openflowplugin/openflowplugin-csit-config-performance-old.yaml
@@ -0,0 +1,43 @@
+- project:
+    name: openflowplugin-csit-config-performance-old
+    jobs:
+        - '{project}-csit-1node-{functionality}-{install}-{stream}'
+
+    # The project name
+    project: 'openflowplugin'
+
+    # The functionality under test
+    functionality: 'config-performance'
+
+    # Project branches
+    stream:
+        - beryllium:
+            branch: 'stable/beryllium'
+            jre: 'openjdk7'
+        - stable-lithium:
+            branch: 'stable/lithium'
+            jre: 'openjdk7'
+
+    install:
+        - only:
+            scope: 'only'
+
+    # Features to install
+    install-features: 'odl-openflowplugin-flow-services-ui'
+
+    # Robot custom options
+    robot-options: ''
+
+    # Trigger jobs (upstream dependencies)
+    trigger-jobs: 'yangtools-distribution-{stream},controller-distribution-{stream},openflowjava-distribution-{stream},openflowplugin-distribution-{stream}'
+
+    # Plot Info
+    01-plot-title: 'Flow REST API Rate'
+    01-plot-yaxis: 'http_req/sec'
+    01-plot-group: 'Flow Config Performance'
+    01-plot-data-file: 'rates.csv'
+    02-plot-title: 'Flow Stats Collect Time'
+    02-plot-yaxis: 'seconds'
+    02-plot-group: 'Stats Collect Performance'
+    02-plot-data-file: 'times.csv'
+

diff --git a/jjb/openflowplugin/openflowplugin-csit-config-performance.yaml b/jjb/openflowplugin/openflowplugin-csit-config-performance.yaml
index d6c58e7132f2e7351943b3e96d4bbed56ad48e18..3a9152863bd8694a35abae304ab00412e8532106 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-config-performance.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-config-performance.yaml
@@ -14,12 +14,6 @@
         - boron:
             branch: 'master'
             jre: 'openjdk8'
-        - beryllium:
-            branch: 'stable/beryllium'
-            jre: 'openjdk7'
-        - stable-lithium:
-            branch: 'stable/lithium'
-            jre: 'openjdk7'
 
     install:
         - only:

diff --git a/jjb/openflowplugin/openflowplugin-csit-statistics-basic-lithium-redesign.yaml b/jjb/openflowplugin/openflowplugin-csit-flow-services-helium-redesign.yaml
similarity index 54%
rename from jjb/openflowplugin/openflowplugin-csit-statistics-basic-lithium-redesign.yaml
rename to jjb/openflowplugin/openflowplugin-csit-flow-services-helium-redesign.yaml
index 184bd392d63679092dd9b1786474af7f482e9ada..b33b1d8e15896fc16765b2291187c6879bfd55b1 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-statistics-basic-lithium-redesign.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-flow-services-helium-redesign.yaml
@@ -1,32 +1,30 @@
 - project:
-    name: openflowplugin-csit-statistics-basic-lithium-redesign
+    name: openflowplugin-csit-flow-services-helium-redesign
     jobs:
         - '{project}-csit-1node-{functionality}-{install}-{stream}'
+        - '{project}-csit-verify-1node-{functionality}'
 
     # The project name
     project: 'openflowplugin'
 
     # The functionality under test
-    functionality: 'statistics-basic-lithium-redesign'
+    functionality: 'flow-services-helium-redesign'
 
     # Project branches
     stream:
         - boron:
             branch: 'master'
             jre: 'openjdk8'
-        - beryllium:
-            branch: 'stable/beryllium'
-            jre: 'openjdk7'
 
     install:
         - only:
             scope: 'only'
 
     # Features to install
-    install-features: 'odl-openflowplugin-flow-services-ui-li'
+    install-features: 'odl-openflowplugin-flow-services-ui-he'
 
     # Robot custom options
     robot-options: ''
 
     # Trigger jobs (upstream dependencies)
-    trigger-jobs: ''
+    trigger-jobs: 'yangtools-distribution-{stream},controller-distribution-{stream},openflowjava-distribution-{stream},openflowplugin-distribution-{stream}'

diff --git a/jjb/openflowplugin/openflowplugin-csit-flow-services-lithium-redesign.yaml b/jjb/openflowplugin/openflowplugin-csit-flow-services-lithium-redesign-old.yaml
similarity index 86%
rename from jjb/openflowplugin/openflowplugin-csit-flow-services-lithium-redesign.yaml
rename to jjb/openflowplugin/openflowplugin-csit-flow-services-lithium-redesign-old.yaml
index ecf9b7934ecf277775e0f6a60c99aa0f410b0de1..4f1f50f7c1ac60e3c5bae201e7d98c9ccdd04210 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-flow-services-lithium-redesign.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-flow-services-lithium-redesign-old.yaml
@@ -1,5 +1,5 @@
 - project:
-    name: openflowplugin-csit-flow-services-lithium-redesign
+    name: openflowplugin-csit-flow-services-lithium-redesign-old
     jobs:
         - '{project}-csit-1node-{functionality}-{install}-{stream}'
 
@@ -11,9 +11,6 @@
 
     # Project branches
     stream:
-        - boron:
-            branch: 'master'
-            jre: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
             jre: 'openjdk7'

diff --git a/jjb/openflowplugin/openflowplugin-csit-flow-services-lithium.yaml b/jjb/openflowplugin/openflowplugin-csit-flow-services-old.yaml
similarity index 85%
rename from jjb/openflowplugin/openflowplugin-csit-flow-services-lithium.yaml
rename to jjb/openflowplugin/openflowplugin-csit-flow-services-old.yaml
index 88707cb6b9602b28f7326e7cb29b7bb4ddea7b08..884e824b5957ec3c122b28aa04309b9f90b8e94b 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-flow-services-lithium.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-flow-services-old.yaml
@@ -1,5 +1,5 @@
 - project:
-    name: openflowplugin-csit-flow-services-lithium
+    name: openflowplugin-csit-flow-services-old
     jobs:
         - '{project}-csit-1node-{functionality}-{install}-{stream}'
 
@@ -11,6 +11,9 @@
 
     # Project branches
     stream:
+        - beryllium:
+            branch: 'stable/beryllium'
+            jre: 'openjdk7'
         - stable-lithium:
             branch: 'stable/lithium'
             jre: 'openjdk7'

diff --git a/jjb/openflowplugin/openflowplugin-csit-flow-services.yaml b/jjb/openflowplugin/openflowplugin-csit-flow-services.yaml
index e7ee3c5d9acd05cd4a869e05b882f77a64b687b3..b45063b51d76a2d0f8f040f2aca722829fc2a82b 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-flow-services.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-flow-services.yaml
@@ -15,9 +15,6 @@
         - boron:
             branch: 'master'
             jre: 'openjdk8'
-        - beryllium:
-            branch: 'stable/beryllium'
-            jre: 'openjdk7'
 
     install:
         - only:

diff --git a/jjb/openflowplugin/openflowplugin-csit-link-scalability-daily-helium-redesign.yaml b/jjb/openflowplugin/openflowplugin-csit-link-scalability-daily-helium-redesign.yaml
new file mode 100644 (file)
index 0000000..ad4dc47
--- /dev/null
+++ b/jjb/openflowplugin/openflowplugin-csit-link-scalability-daily-helium-redesign.yaml
@@ -0,0 +1,35 @@
+- project:
+    name: openflowplugin-csit-link-scalability-daily-helium-redesign
+    jobs:
+        - '{project}-csit-1node-periodic-{functionality}-{install}-{stream}'
+
+    # The project name
+    project: 'openflowplugin'
+
+    # The functionality under test
+    functionality: 'link-scalability-daily-helium-redesign'
+
+    # Project branches
+    stream:
+        - boron:
+            branch: 'master'
+            jre: 'openjdk8'
+
+    install:
+        - only:
+            scope: 'only'
+
+    # Features to install
+    install-features: 'odl-openflowplugin-flow-services-ui-he'
+
+    # Robot custom options
+    robot-options: ''
+
+    # Trigger jobs (daily)
+    schedule: 'H H * * *'
+
+    # Plot Info
+    01-plot-title: 'Max number of switch links'
+    01-plot-yaxis: 'Links'
+    01-plot-group: 'Inventory Switch Link Scalability'
+    01-plot-data-file: 'links.csv'

diff --git a/jjb/openflowplugin/openflowplugin-csit-link-scalability-daily-lithium-redesign.yaml b/jjb/openflowplugin/openflowplugin-csit-link-scalability-daily-lithium-redesign-old.yaml
similarity index 92%
rename from jjb/openflowplugin/openflowplugin-csit-link-scalability-daily-lithium-redesign.yaml
rename to jjb/openflowplugin/openflowplugin-csit-link-scalability-daily-lithium-redesign-old.yaml
index 0165466709445ec42364f9ff8942c53fb0bccdf9..535cac552d1cc95f279d86557e164d8fadfefb44 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-link-scalability-daily-lithium-redesign.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-link-scalability-daily-lithium-redesign-old.yaml
@@ -1,5 +1,5 @@
 - project:
-    name: openflowplugin-csit-link-scalability-daily-lithium-redesign
+    name: openflowplugin-csit-link-scalability-daily-lithium-redesign-old
     jobs:
         - '{project}-csit-1node-periodic-{functionality}-{install}-{stream}'
 
@@ -11,9 +11,6 @@
 
     # Project branches
     stream:
-        - boron:
-            branch: 'master'
-            jre: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
             jre: 'openjdk7'

diff --git a/jjb/openflowplugin/openflowplugin-csit-link-scalability-daily-old.yaml b/jjb/openflowplugin/openflowplugin-csit-link-scalability-daily-old.yaml
new file mode 100644 (file)
index 0000000..98991e9
--- /dev/null
+++ b/jjb/openflowplugin/openflowplugin-csit-link-scalability-daily-old.yaml
@@ -0,0 +1,38 @@
+- project:
+    name: openflowplugin-csit-link-scalability-daily-old
+    jobs:
+        - '{project}-csit-1node-periodic-{functionality}-{install}-{stream}'
+
+    # The project name
+    project: 'openflowplugin'
+
+    # The functionality under test
+    functionality: 'link-scalability-daily'
+
+    # Project branches
+    stream:
+        - beryllium:
+            branch: 'stable/beryllium'
+            jre: 'openjdk7'
+        - stable-lithium:
+            branch: 'stable/lithium'
+            jre: 'openjdk7'
+
+    install:
+        - only:
+            scope: 'only'
+
+    # Features to install
+    install-features: 'odl-openflowplugin-flow-services-ui'
+
+    # Robot custom options
+    robot-options: ''
+
+    # Trigger jobs (daily)
+    schedule: 'H H * * *'
+
+    # Plot Info
+    01-plot-title: 'Max number of switch links'
+    01-plot-yaxis: 'Links'
+    01-plot-group: 'Inventory Switch Link Scalability'
+    01-plot-data-file: 'links.csv'

diff --git a/jjb/openflowplugin/openflowplugin-csit-link-scalability-daily.yaml b/jjb/openflowplugin/openflowplugin-csit-link-scalability-daily.yaml
index e6185dc198c25df91b39631979a36a8711230617..6181bb0e35d5024ea5f1048460d7bbd847d2e2d3 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-link-scalability-daily.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-link-scalability-daily.yaml
@@ -14,12 +14,6 @@
         - boron:
             branch: 'master'
             jre: 'openjdk8'
-        - beryllium:
-            branch: 'stable/beryllium'
-            jre: 'openjdk7'
-        - stable-lithium:
-            branch: 'stable/lithium'
-            jre: 'openjdk7'
 
     install:
         - only:

diff --git a/jjb/openflowplugin/openflowplugin-csit-longevity-helium-redesign.yaml b/jjb/openflowplugin/openflowplugin-csit-longevity-helium-redesign.yaml
new file mode 100644 (file)
index 0000000..2cb193e
--- /dev/null
+++ b/jjb/openflowplugin/openflowplugin-csit-longevity-helium-redesign.yaml
@@ -0,0 +1,29 @@
+- project:
+    name: openflowplugin-csit-longevity-helium-redesign
+    jobs:
+        - '{project}-csit-1node-periodic-{functionality}-{install}-{stream}'
+
+    # The project name
+    project: 'openflowplugin'
+
+    # The functionality under test
+    functionality: 'longevity-helium-redesign'
+
+    # Project branches
+    stream:
+        - boron:
+            branch: 'master'
+            jre: 'openjdk8'
+
+    install:
+        - only:
+            scope: 'only'
+
+    # Features to install
+    install-features: 'odl-openflowplugin-flow-services-ui-he'
+
+    # Robot custom options
+    robot-options: '-v TEST_LENGTH:23@hours --escape space:@'
+
+    # Trigger jobs (daily)
+    schedule: 'H H * * *'

diff --git a/jjb/openflowplugin/openflowplugin-csit-longevity-lithium-redesign.yaml b/jjb/openflowplugin/openflowplugin-csit-longevity-lithium-redesign-old.yaml
similarity index 83%
rename from jjb/openflowplugin/openflowplugin-csit-longevity-lithium-redesign.yaml
rename to jjb/openflowplugin/openflowplugin-csit-longevity-lithium-redesign-old.yaml
index 08c002d8f69cd6c73f0d2b5d7cb72be87df5514d..0d04635b12a30eaaec1e648d7155d40c2d3221f3 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-longevity-lithium-redesign.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-longevity-lithium-redesign-old.yaml
@@ -1,5 +1,5 @@
 - project:
-    name: openflowplugin-csit-longevity-lithium-redesign
+    name: openflowplugin-csit-longevity-lithium-redesign-old
     jobs:
         - '{project}-csit-1node-periodic-{functionality}-{install}-{stream}'
 
@@ -11,9 +11,6 @@
 
     # Project branches
     stream:
-        - boron:
-            branch: 'master'
-            jre: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
             jre: 'openjdk7'

diff --git a/jjb/openflowplugin/openflowplugin-csit-longevity-old.yaml b/jjb/openflowplugin/openflowplugin-csit-longevity-old.yaml
new file mode 100644 (file)
index 0000000..2a20fe4
--- /dev/null
+++ b/jjb/openflowplugin/openflowplugin-csit-longevity-old.yaml
@@ -0,0 +1,29 @@
+- project:
+    name: openflowplugin-csit-longevity-old
+    jobs:
+        - '{project}-csit-1node-periodic-{functionality}-{install}-{stream}'
+
+    # The project name
+    project: 'openflowplugin'
+
+    # The functionality under test
+    functionality: 'longevity'
+
+    # Project branches
+    stream:
+        - beryllium:
+            branch: 'stable/beryllium'
+            jre: 'openjdk7'
+
+    install:
+        - only:
+            scope: 'only'
+
+    # Features to install
+    install-features: 'odl-openflowplugin-flow-services-ui'
+
+    # Robot custom options
+    robot-options: '-v TEST_LENGTH:23@hours --escape space:@'
+
+    # Trigger jobs (daily)
+    schedule: 'H H * * *'

diff --git a/jjb/openflowplugin/openflowplugin-csit-longevity.yaml b/jjb/openflowplugin/openflowplugin-csit-longevity.yaml
index dec9532f6ed2f4942edfbfb711d0d269e7e3c3bf..3311e06e29d94f4b173eeadda695b3d75a7827c6 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-longevity.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-longevity.yaml
@@ -14,9 +14,6 @@
         - boron:
             branch: 'master'
             jre: 'openjdk8'
-        - beryllium:
-            branch: 'stable/beryllium'
-            jre: 'openjdk7'
 
     install:
         - only:

diff --git a/jjb/openflowplugin/openflowplugin-csit-rpc-time-measure-daily-helium-redesign.yaml b/jjb/openflowplugin/openflowplugin-csit-rpc-time-measure-daily-helium-redesign.yaml
new file mode 100644 (file)
index 0000000..d3d4760
--- /dev/null
+++ b/jjb/openflowplugin/openflowplugin-csit-rpc-time-measure-daily-helium-redesign.yaml
@@ -0,0 +1,35 @@
+- project:
+    name: openflowplugin-csit-rpc-time-measure-daily-helium-redesign
+    jobs:
+        - '{project}-csit-1node-periodic-{functionality}-{install}-{stream}'
+
+    # The project name
+    project: 'openflowplugin'
+
+    # The functionality under test
+    functionality: 'rpc-time-measure-daily-helium-redesign'
+
+    # Project branches
+    stream:
+        - boron:
+            branch: 'master'
+            jre: 'openjdk8'
+
+    install:
+        - only:
+            scope: 'only'
+
+    # Features to install
+    install-features: 'odl-openflowplugin-flow-services-ui-he,odl-openflowplugin-app-bulk-o-matic-he'
+
+    # Robot custom options
+    robot-options: ''
+
+    # Trigger jobs (daily)
+    schedule: 'H H * * *'
+
+    # Plot Info
+    01-plot-title: 'REST setup rate (for 100k flows)'
+    01-plot-yaxis: 'setup time[s], req[flows/s]'
+    01-plot-group: 'Performance Rate'
+    01-plot-data-file: 'flows_setup_time.csv'

diff --git a/jjb/openflowplugin/openflowplugin-csit-rpc-time-measure-daily-lithium-redesign.yaml b/jjb/openflowplugin/openflowplugin-csit-rpc-time-measure-daily-lithium-redesign-old.yaml
similarity index 92%
rename from jjb/openflowplugin/openflowplugin-csit-rpc-time-measure-daily-lithium-redesign.yaml
rename to jjb/openflowplugin/openflowplugin-csit-rpc-time-measure-daily-lithium-redesign-old.yaml
index c13625949237e7436e2048608b80958c5df8e21f..89117f00162ac9350e4cb5e3ee6e5bb36b5ad506 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-rpc-time-measure-daily-lithium-redesign.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-rpc-time-measure-daily-lithium-redesign-old.yaml
@@ -1,5 +1,5 @@
 - project:
-    name: openflowplugin-csit-rpc-time-measure-daily-lithium-redesign
+    name: openflowplugin-csit-rpc-time-measure-daily-lithium-redesign-old
     jobs:
         - '{project}-csit-1node-periodic-{functionality}-{install}-{stream}'
 
@@ -11,9 +11,6 @@
 
     # Project branches
     stream:
-        - boron:
-            branch: 'master'
-            jre: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
             jre: 'openjdk7'

diff --git a/jjb/openflowplugin/openflowplugin-csit-rpc-time-measure-daily-old.yaml b/jjb/openflowplugin/openflowplugin-csit-rpc-time-measure-daily-old.yaml
new file mode 100644 (file)
index 0000000..a388f8f
--- /dev/null
+++ b/jjb/openflowplugin/openflowplugin-csit-rpc-time-measure-daily-old.yaml
@@ -0,0 +1,38 @@
+- project:
+    name: openflowplugin-csit-rpc-time-measure-daily-old
+    jobs:
+        - '{project}-csit-1node-periodic-{functionality}-{install}-{stream}'
+
+    # The project name
+    project: 'openflowplugin'
+
+    # The functionality under test
+    functionality: 'rpc-time-measure-daily'
+
+    # Project branches
+    stream:
+        - beryllium:
+            branch: 'stable/beryllium'
+            jre: 'openjdk7'
+        - stable-lithium:
+            branch: 'stable/lithium'
+            jre: 'openjdk7'
+
+    install:
+        - only:
+            scope: 'only'
+
+    # Features to install
+    install-features: 'odl-openflowplugin-flow-services-ui,odl-openflowplugin-app-bulk-o-matic'
+
+    # Robot custom options
+    robot-options: ''
+
+    # Trigger jobs (daily)
+    schedule: 'H H * * *'
+
+    # Plot Info
+    01-plot-title: 'REST setup rate (for 100k flows)'
+    01-plot-yaxis: 'setup time[s], req[flows/s]'
+    01-plot-group: 'Performance Rate'
+    01-plot-data-file: 'flows_setup_time.csv'

diff --git a/jjb/openflowplugin/openflowplugin-csit-rpc-time-measure-daily.yaml b/jjb/openflowplugin/openflowplugin-csit-rpc-time-measure-daily.yaml
index 858ff41f38442d9ceae32f5342b79da66c76b1b4..d43ce8c15c2a8cb70be8130c176260ac10a533ad 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-rpc-time-measure-daily.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-rpc-time-measure-daily.yaml
@@ -14,12 +14,6 @@
         - boron:
             branch: 'master'
             jre: 'openjdk8'
-        - beryllium:
-            branch: 'stable/beryllium'
-            jre: 'openjdk7'
-        - stable-lithium:
-            branch: 'stable/lithium'
-            jre: 'openjdk7'
 
     install:
         - only:

diff --git a/jjb/openflowplugin/openflowplugin-csit-scalability-daily-helium-redesign.yaml b/jjb/openflowplugin/openflowplugin-csit-scalability-daily-helium-redesign.yaml
new file mode 100644 (file)
index 0000000..d4ae766
--- /dev/null
+++ b/jjb/openflowplugin/openflowplugin-csit-scalability-daily-helium-redesign.yaml
@@ -0,0 +1,35 @@
+- project:
+    name: openflowplugin-csit-scalability-daily-helium-redesign
+    jobs:
+        - '{project}-csit-1node-periodic-{functionality}-{install}-{stream}'
+
+    # The project name
+    project: 'openflowplugin'
+
+    # The functionality under test
+    functionality: 'scalability-daily-helium-redesign'
+
+    # Project branches
+    stream:
+        - boron:
+            branch: 'master'
+            jre: 'openjdk8'
+
+    install:
+        - only:
+            scope: 'only'
+
+    # Features to install
+    install-features: 'odl-openflowplugin-flow-services-ui-he'
+
+    # Robot custom options
+    robot-options: '-v MIN_SWITCHES:100 -v MAX_SWITCHES:500 -v STEP_SWITCHES:100'
+
+    # Trigger jobs (daily)
+    schedule: 'H H * * *'
+
+    # Plot Info
+    01-plot-title: 'Max number of Switches'
+    01-plot-yaxis: 'OpenFlow Switches'
+    01-plot-group: 'Inventory Scalability'
+    01-plot-data-file: 'switches.csv'

diff --git a/jjb/openflowplugin/openflowplugin-csit-scalability-daily-lithium-redesign.yaml b/jjb/openflowplugin/openflowplugin-csit-scalability-daily-lithium-redesign-old.yaml
similarity index 93%
rename from jjb/openflowplugin/openflowplugin-csit-scalability-daily-lithium-redesign.yaml
rename to jjb/openflowplugin/openflowplugin-csit-scalability-daily-lithium-redesign-old.yaml
index 6fbcce25cfb1eb53e74dd8f606cfac44bef44eda..ebc7d27626e905418389b2b6098684e91727e950 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-scalability-daily-lithium-redesign.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-scalability-daily-lithium-redesign-old.yaml
@@ -1,5 +1,5 @@
 - project:
-    name: openflowplugin-csit-scalability-daily-lithium-redesign
+    name: openflowplugin-csit-scalability-daily-lithium-redesign-old
     jobs:
         - '{project}-csit-1node-periodic-{functionality}-{install}-{stream}'
 
@@ -11,9 +11,6 @@
 
     # Project branches
     stream:
-        - boron:
-            branch: 'master'
-            jre: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
             jre: 'openjdk7'

diff --git a/jjb/openflowplugin/openflowplugin-csit-scalability-daily-old.yaml b/jjb/openflowplugin/openflowplugin-csit-scalability-daily-old.yaml
new file mode 100644 (file)
index 0000000..e8c9fa9
--- /dev/null
+++ b/jjb/openflowplugin/openflowplugin-csit-scalability-daily-old.yaml
@@ -0,0 +1,38 @@
+- project:
+    name: openflowplugin-csit-scalability-daily-old
+    jobs:
+        - '{project}-csit-1node-periodic-{functionality}-{install}-{stream}'
+
+    # The project name
+    project: 'openflowplugin'
+
+    # The functionality under test
+    functionality: 'scalability-daily'
+
+    # Project branches
+    stream:
+        - beryllium:
+            branch: 'stable/beryllium'
+            jre: 'openjdk7'
+        - stable-lithium:
+            branch: 'stable/lithium'
+            jre: 'openjdk7'
+
+    install:
+        - only:
+            scope: 'only'
+
+    # Features to install
+    install-features: 'odl-openflowplugin-flow-services-ui'
+
+    # Robot custom options
+    robot-options: '-v MIN_SWITCHES:100 -v MAX_SWITCHES:500 -v STEP_SWITCHES:100'
+
+    # Trigger jobs (daily)
+    schedule: 'H H * * *'
+
+    # Plot Info
+    01-plot-title: 'Max number of Switches'
+    01-plot-yaxis: 'OpenFlow Switches'
+    01-plot-group: 'Inventory Scalability'
+    01-plot-data-file: 'switches.csv'

diff --git a/jjb/openflowplugin/openflowplugin-csit-scalability-daily.yaml b/jjb/openflowplugin/openflowplugin-csit-scalability-daily.yaml
index 4d15d5a81aa88100261fc5917e769ef65f94a96c..ccec832b42234d2390ef27d92c7d75df4931b81e 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-scalability-daily.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-scalability-daily.yaml
@@ -14,12 +14,6 @@
         - boron:
             branch: 'master'
             jre: 'openjdk8'
-        - beryllium:
-            branch: 'stable/beryllium'
-            jre: 'openjdk7'
-        - stable-lithium:
-            branch: 'stable/lithium'
-            jre: 'openjdk7'
 
     install:
         - only:

diff --git a/jjb/openflowplugin/openflowplugin-csit-scalability-helium-redesign.yaml b/jjb/openflowplugin/openflowplugin-csit-scalability-helium-redesign.yaml
new file mode 100644 (file)
index 0000000..7c3ffbd
--- /dev/null
+++ b/jjb/openflowplugin/openflowplugin-csit-scalability-helium-redesign.yaml
@@ -0,0 +1,29 @@
+- project:
+    name: openflowplugin-csit-scalability-helium-redesign
+    jobs:
+        - '{project}-csit-1node-{functionality}-{install}-{stream}'
+
+    # The project name
+    project: 'openflowplugin'
+
+    # The functionality under test
+    functionality: 'scalability-helium-redesign'
+
+    # Project branches
+    stream:
+        - boron:
+            branch: 'master'
+            jre: 'openjdk8'
+
+    install:
+        - only:
+            scope: 'only'
+
+    # Features to install
+    install-features: 'odl-openflowplugin-flow-services-ui-he'
+
+    # Robot custom options
+    robot-options: '-v TOPO_TREE_DEPTH:7'
+
+    # 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-scalability-lithium-redesign.yaml b/jjb/openflowplugin/openflowplugin-csit-scalability-lithium-redesign-old.yaml
similarity index 86%
rename from jjb/openflowplugin/openflowplugin-csit-scalability-lithium-redesign.yaml
rename to jjb/openflowplugin/openflowplugin-csit-scalability-lithium-redesign-old.yaml
index b06cc8036f4a3540f338419637eace0dec222fb8..53cc09f9e4fbbd0582bf243b7d823ec300d0ba12 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-scalability-lithium-redesign.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-scalability-lithium-redesign-old.yaml
@@ -1,5 +1,5 @@
 - project:
-    name: openflowplugin-csit-scalability-lithium-redesign
+    name: openflowplugin-csit-scalability-lithium-redesign-old
     jobs:
         - '{project}-csit-1node-{functionality}-{install}-{stream}'
 
@@ -11,9 +11,6 @@
 
     # Project branches
     stream:
-        - boron:
-            branch: 'master'
-            jre: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
             jre: 'openjdk7'

diff --git a/jjb/openflowplugin/openflowplugin-csit-scalability-old.yaml b/jjb/openflowplugin/openflowplugin-csit-scalability-old.yaml
new file mode 100644 (file)
index 0000000..fb5d410
--- /dev/null
+++ b/jjb/openflowplugin/openflowplugin-csit-scalability-old.yaml
@@ -0,0 +1,32 @@
+- project:
+    name: openflowplugin-csit-scalability-old
+    jobs:
+        - '{project}-csit-1node-{functionality}-{install}-{stream}'
+
+    # The project name
+    project: 'openflowplugin'
+
+    # The functionality under test
+    functionality: 'scalability'
+
+    # Project branches
+    stream:
+        - beryllium:
+            branch: 'stable/beryllium'
+            jre: 'openjdk7'
+        - stable-lithium:
+            branch: 'stable/lithium'
+            jre: 'openjdk7'
+
+    install:
+        - only:
+            scope: 'only'
+
+    # Features to install
+    install-features: 'odl-openflowplugin-flow-services-ui'
+
+    # Robot custom options
+    robot-options: '-v TOPO_TREE_DEPTH:7'
+
+    # 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-scalability.yaml b/jjb/openflowplugin/openflowplugin-csit-scalability.yaml
index 8ed9489c03a32aa4ea862e1751df34953dd5d322..f5e25308a18b935a4feff9403c4f2318f342939a 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-scalability.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-scalability.yaml
@@ -14,18 +14,10 @@
         - boron:
             branch: 'master'
             jre: 'openjdk8'
-        - beryllium:
-            branch: 'stable/beryllium'
-            jre: 'openjdk7'
-        - stable-lithium:
-            branch: 'stable/lithium'
-            jre: 'openjdk7'
 
     install:
         - only:
             scope: 'only'
-        - all:
-            scope: 'all'
 
     # Features to install
     install-features: 'odl-openflowplugin-flow-services-ui'

diff --git a/jjb/openflowplugin/openflowplugin-csit-scale-stats-collection-daily-helium-redesign.yaml b/jjb/openflowplugin/openflowplugin-csit-scale-stats-collection-daily-helium-redesign.yaml
new file mode 100644 (file)
index 0000000..a2c2f0a
--- /dev/null
+++ b/jjb/openflowplugin/openflowplugin-csit-scale-stats-collection-daily-helium-redesign.yaml
@@ -0,0 +1,40 @@
+- project:
+    name: openflowplugin-csit-scale-stats-collection-daily-helium-redesign
+    jobs:
+        - '{project}-csit-1node-periodic-{functionality}-{install}-{stream}'
+
+    # The project name
+    project: 'openflowplugin'
+
+    # The functionality under test
+    functionality: 'scale-stats-collection-daily-helium-redesign'
+
+    # Project branches
+    stream:
+        - boron:
+            branch: 'master'
+            jre: 'openjdk8'
+
+    install:
+        - only:
+            scope: 'only'
+
+    # Features to install
+    install-features: 'odl-openflowplugin-flow-services-ui-he'
+
+    # Robot custom options
+    robot-options: ''
+
+    # Trigger jobs (daily)
+    schedule: 'H H * * *'
+
+    # Plot Info
+    01-plot-title: 'Flows (100k) Setup Time'
+    01-plot-yaxis: '[s]'
+    01-plot-group: 'Config Performance'
+    01-plot-data-file: 'flows_setup_time.csv'
+
+    02-plot-title: 'REST setup rate (for 100k flows)'
+    02-plot-yaxis: 'setup time[s], req[flows/s]'
+    02-plot-group: 'Performance Rate'
+    02-plot-data-file: 'flows_install_rate.csv'

diff --git a/jjb/openflowplugin/openflowplugin-csit-scale-stats-collection-daily-lithium-redesign.yaml b/jjb/openflowplugin/openflowplugin-csit-scale-stats-collection-daily-lithium-redesign-old.yaml
similarity index 90%
rename from jjb/openflowplugin/openflowplugin-csit-scale-stats-collection-daily-lithium-redesign.yaml
rename to jjb/openflowplugin/openflowplugin-csit-scale-stats-collection-daily-lithium-redesign-old.yaml
index d10c6df40270aaffab248b7c24016b74cba41fdc..e506ef4695120adb563197a43abda8d8f1e1d44a 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-scale-stats-collection-daily-lithium-redesign.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-scale-stats-collection-daily-lithium-redesign-old.yaml
@@ -1,5 +1,5 @@
 - project:
-    name: openflowplugin-csit-scale-stats-collection-daily-lithium-redesign
+    name: openflowplugin-csit-scale-stats-collection-daily-lithium-redesign-old
     jobs:
         - '{project}-csit-1node-periodic-{functionality}-{install}-{stream}'
 
@@ -11,9 +11,6 @@
 
     # Project branches
     stream:
-        - boron:
-            branch: 'master'
-            jre: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
             jre: 'openjdk7'
@@ -32,7 +29,7 @@
     robot-options: ''
 
     # Trigger jobs (daily)
-    schedule: 'H H/12 * * *'
+    schedule: 'H H * * *'
 
     # Plot Info
     01-plot-title: 'Flows (100k) Setup Time'

diff --git a/jjb/openflowplugin/openflowplugin-csit-scale-stats-collection-daily-old.yaml b/jjb/openflowplugin/openflowplugin-csit-scale-stats-collection-daily-old.yaml
new file mode 100644 (file)
index 0000000..b74bb6f
--- /dev/null
+++ b/jjb/openflowplugin/openflowplugin-csit-scale-stats-collection-daily-old.yaml
@@ -0,0 +1,43 @@
+- project:
+    name: openflowplugin-csit-scale-stats-collection-daily-old
+    jobs:
+        - '{project}-csit-1node-periodic-{functionality}-{install}-{stream}'
+
+    # The project name
+    project: 'openflowplugin'
+
+    # The functionality under test
+    functionality: 'scale-stats-collection-daily'
+
+    # Project branches
+    stream:
+        - beryllium:
+            branch: 'stable/beryllium'
+            jre: 'openjdk7'
+        - stable-lithium:
+            branch: 'stable/lithium'
+            jre: 'openjdk7'
+
+    install:
+        - only:
+            scope: 'only'
+
+    # Features to install
+    install-features: 'odl-openflowplugin-flow-services-ui'
+
+    # Robot custom options
+    robot-options: ''
+
+    # Trigger jobs (daily)
+    schedule: 'H H * * *'
+
+    # Plot Info
+    01-plot-title: 'Flows (100k) Setup Time'
+    01-plot-yaxis: '[s]'
+    01-plot-group: 'Config Performance'
+    01-plot-data-file: 'flows_setup_time.csv'
+
+    02-plot-title: 'REST setup rate (for 100k flows)'
+    02-plot-yaxis: 'setup time[s], req[flows/s]'
+    02-plot-group: 'Performance Rate'
+    02-plot-data-file: 'flows_install_rate.csv'

diff --git a/jjb/openflowplugin/openflowplugin-csit-scale-stats-collection-daily.yaml b/jjb/openflowplugin/openflowplugin-csit-scale-stats-collection-daily.yaml
index 480dedbaef8b716541c8578501afe56f69ccd98b..4d0f07e17777dfb3238446995f9f57f9cd8be4c7 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,6 @@
         - boron:
             branch: 'master'
             jre: 'openjdk8'
-        - beryllium:
-            branch: 'stable/beryllium'
-            jre: 'openjdk7'
-        - stable-lithium:
-            branch: 'stable/lithium'
-            jre: 'openjdk7'
 
     install:
         - only:
@@ -32,7 +26,7 @@
     robot-options: ''
 
     # Trigger jobs (daily)
-    schedule: 'H H/12 * * *'
+    schedule: 'H H * * *'
 
     # Plot Info
     01-plot-title: 'Flows (100k) Setup Time'

diff --git a/jjb/openflowplugin/openflowplugin-csit-sw-scalability-daily-helium-redesign.yaml b/jjb/openflowplugin/openflowplugin-csit-sw-scalability-daily-helium-redesign.yaml
new file mode 100644 (file)
index 0000000..5e7e28f
--- /dev/null
+++ b/jjb/openflowplugin/openflowplugin-csit-sw-scalability-daily-helium-redesign.yaml
@@ -0,0 +1,35 @@
+- project:
+    name: openflowplugin-csit-sw-scalability-daily-helium-redesign
+    jobs:
+        - '{project}-csit-1node-periodic-{functionality}-{install}-{stream}'
+
+    # The project name
+    project: 'openflowplugin'
+
+    # The functionality under test
+    functionality: 'sw-scalability-daily-helium-redesign'
+
+    # Project branches
+    stream:
+        - boron:
+            branch: 'master'
+            jre: 'openjdk8'
+
+    install:
+        - only:
+            scope: 'only'
+
+    # Features to install
+    install-features: 'odl-openflowplugin-flow-services-ui-he'
+
+    # Robot custom options
+    robot-options: ''
+
+    # Trigger jobs (daily)
+    schedule: 'H H * * *'
+
+    # Plot Info
+    01-plot-title: 'Max number of Switches'
+    01-plot-yaxis: 'OpenFlow Switches'
+    01-plot-group: 'Inventory Scalability'
+    01-plot-data-file: 'max_found.csv'

diff --git a/jjb/openflowplugin/openflowplugin-csit-sw-scalability-daily-lithium-redesign.yaml b/jjb/openflowplugin/openflowplugin-csit-sw-scalability-daily-lithium-redesign-old.yaml
similarity index 92%
rename from jjb/openflowplugin/openflowplugin-csit-sw-scalability-daily-lithium-redesign.yaml
rename to jjb/openflowplugin/openflowplugin-csit-sw-scalability-daily-lithium-redesign-old.yaml
index 301e78ff0d2e425b9cc3329639bf11aaada59bd4..50cfe2ab29794ba45b47fb3010c18c828d7563ce 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-sw-scalability-daily-lithium-redesign.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-sw-scalability-daily-lithium-redesign-old.yaml
@@ -1,5 +1,5 @@
 - project:
-    name: openflowplugin-csit-sw-scalability-daily-lithium-redesign
+    name: openflowplugin-csit-sw-scalability-daily-lithium-redesign-old
     jobs:
         - '{project}-csit-1node-periodic-{functionality}-{install}-{stream}'
 
@@ -11,9 +11,6 @@
 
     # Project branches
     stream:
-        - boron:
-            branch: 'master'
-            jre: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
             jre: 'openjdk7'

diff --git a/jjb/openflowplugin/openflowplugin-csit-sw-scalability-daily-old.yaml b/jjb/openflowplugin/openflowplugin-csit-sw-scalability-daily-old.yaml
new file mode 100644 (file)
index 0000000..b7110c0
--- /dev/null
+++ b/jjb/openflowplugin/openflowplugin-csit-sw-scalability-daily-old.yaml
@@ -0,0 +1,38 @@
+- project:
+    name: openflowplugin-csit-sw-scalability-daily-old
+    jobs:
+        - '{project}-csit-1node-periodic-{functionality}-{install}-{stream}'
+
+    # The project name
+    project: 'openflowplugin'
+
+    # The functionality under test
+    functionality: 'sw-scalability-daily'
+
+    # Project branches
+    stream:
+        - beryllium:
+            branch: 'stable/beryllium'
+            jre: 'openjdk7'
+        - stable-lithium:
+            branch: 'stable/lithium'
+            jre: 'openjdk7'
+
+    install:
+        - only:
+            scope: 'only'
+
+    # Features to install
+    install-features: 'odl-openflowplugin-flow-services-ui'
+
+    # Robot custom options
+    robot-options: ''
+
+    # Trigger jobs (daily)
+    schedule: 'H H * * *'
+
+    # Plot Info
+    01-plot-title: 'Max number of Switches'
+    01-plot-yaxis: 'OpenFlow Switches'
+    01-plot-group: 'Inventory Scalability'
+    01-plot-data-file: 'max_found.csv'

diff --git a/jjb/openflowplugin/openflowplugin-csit-sw-scalability-daily.yaml b/jjb/openflowplugin/openflowplugin-csit-sw-scalability-daily.yaml
index c5e74554b2ef95c53e5fbaa9ab782b415b7b0d59..b09c59a735ed22dc1b72433a965503c8a8f60a28 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-sw-scalability-daily.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-sw-scalability-daily.yaml
@@ -14,12 +14,6 @@
         - boron:
             branch: 'master'
             jre: 'openjdk8'
-        - beryllium:
-            branch: 'stable/beryllium'
-            jre: 'openjdk7'
-        - stable-lithium:
-            branch: 'stable/lithium'
-            jre: 'openjdk7'
 
     install:
         - only: