From: Luis Gomez Date: Fri, 21 Oct 2016 03:50:11 +0000 (-0700) Subject: Refactor OpenFlow sw/link scalability and longevity tests X-Git-Tag: release/boron-sr1~13^2 X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=5976e54271c02f08eba2632245b8dd07cedd58a4;p=releng%2Fbuilder.git Refactor OpenFlow sw/link scalability and longevity tests - Add support for OVS 2.5 - Add topology discovery time and plot for it. - Add JVM monitoring. - Remove redundant sw scale test. This goes with https://git.opendaylight.org/gerrit/#/c/47192 Change-Id: I4174efa5a6084fc8784f0360369ba717b350ebba Signed-off-by: Luis Gomez --- diff --git a/jjb/openflowplugin/openflowplugin-csit-link-scalability-daily-old.yaml b/jjb/openflowplugin/openflowplugin-csit-link-scalability-daily-old.yaml index 3431514b2..0cbce8914 100644 --- a/jjb/openflowplugin/openflowplugin-csit-link-scalability-daily-old.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-link-scalability-daily-old.yaml @@ -20,7 +20,7 @@ scope: 'only' # Features to install - install-features: 'odl-openflowplugin-flow-services-ui' + install-features: 'odl-openflowplugin-flow-services-ui,decanter-collector-jmx,decanter-appender-elasticsearch' # Robot custom options robot-options: '' @@ -29,7 +29,11 @@ schedule: 'H H * * *' # Plot Info - 01-plot-title: 'Max number of switch links' + 01-plot-title: 'Maxmum Links Full Mesh Topology' 01-plot-yaxis: 'Links' - 01-plot-group: 'Inventory Switch Link Scalability' + 01-plot-group: 'Link Scalability' 01-plot-data-file: 'links.csv' + 02-plot-title: 'Topology Discover Time' + 02-plot-yaxis: 'Seconds' + 02-plot-group: 'Link Scalability' + 02-plot-data-file: 'time.csv' diff --git a/jjb/openflowplugin/openflowplugin-csit-link-scalability-daily.yaml b/jjb/openflowplugin/openflowplugin-csit-link-scalability-daily.yaml index b9b9f3475..de2506766 100644 --- a/jjb/openflowplugin/openflowplugin-csit-link-scalability-daily.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-link-scalability-daily.yaml @@ -23,16 +23,23 @@ scope: 'only' # Features to install - install-features: 'odl-openflowplugin-flow-services-ui' + install-features: 'odl-openflowplugin-flow-services-ui,odl-openflowplugin-app-table-miss-enforcer,decanter-collector-jmx,decanter-appender-elasticsearch' # Robot custom options robot-options: '' + # mininet image + mininet-image: 'ubuntu-trusty-mininet-ovs-25-2c-2g' + # Trigger jobs (daily) schedule: 'H H * * *' # Plot Info - 01-plot-title: 'Max number of switch links' + 01-plot-title: 'Maximum Links Full Mesh Topology' 01-plot-yaxis: 'Links' - 01-plot-group: 'Inventory Switch Link Scalability' + 01-plot-group: 'Link Scalability' 01-plot-data-file: 'links.csv' + 02-plot-title: 'Topology Discover Time' + 02-plot-yaxis: 'Seconds' + 02-plot-group: 'Link Scalability' + 02-plot-data-file: 'time.csv' diff --git a/jjb/openflowplugin/openflowplugin-csit-longevity-old.yaml b/jjb/openflowplugin/openflowplugin-csit-longevity-old.yaml index 46073b52f..be18e675e 100644 --- a/jjb/openflowplugin/openflowplugin-csit-longevity-old.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-longevity-old.yaml @@ -24,7 +24,7 @@ install-features: 'odl-openflowplugin-flow-services-ui,decanter-collector-jmx,decanter-appender-elasticsearch' # Robot custom options - robot-options: '-v TEST_LENGTH:23@hours --escape space:@' + robot-options: '-v TEST_LENGTH:23h' # Trigger jobs (daily) schedule: 'H H * * *' diff --git a/jjb/openflowplugin/openflowplugin-csit-longevity.yaml b/jjb/openflowplugin/openflowplugin-csit-longevity.yaml index c34ee5be8..3475cafc7 100644 --- a/jjb/openflowplugin/openflowplugin-csit-longevity.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-longevity.yaml @@ -24,10 +24,13 @@ scope: 'only' # Features to install - install-features: 'odl-openflowplugin-flow-services-ui,decanter-collector-jmx,decanter-appender-elasticsearch' + install-features: 'odl-openflowplugin-flow-services-ui,odl-openflowplugin-app-table-miss-enforcer,decanter-collector-jmx,decanter-appender-elasticsearch' # Robot custom options - robot-options: '-v TEST_LENGTH:23@hours --escape space:@' + robot-options: '-v TEST_LENGTH:23h' + + # mininet image + mininet-image: 'ubuntu-trusty-mininet-ovs-25-2c-2g' # Trigger jobs (daily) schedule: 'H H * * *' diff --git a/jjb/openflowplugin/openflowplugin-csit-scalability-daily-old.yaml b/jjb/openflowplugin/openflowplugin-csit-scalability-daily-old.yaml deleted file mode 100644 index 2f9a5ef92..000000000 --- a/jjb/openflowplugin/openflowplugin-csit-scalability-daily-old.yaml +++ /dev/null @@ -1,35 +0,0 @@ -- 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' - - 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 deleted file mode 100644 index 6859a1f04..000000000 --- a/jjb/openflowplugin/openflowplugin-csit-scalability-daily.yaml +++ /dev/null @@ -1,41 +0,0 @@ -- project: - name: openflowplugin-csit-scalability-daily - jobs: - - '{project}-csit-1node-periodic-{functionality}-{install}-{stream}' - - # The project name - project: 'openflowplugin' - - # The functionality under test - functionality: 'scalability-daily' - - # Project branches - stream: - - carbon: - branch: 'master' - jre: 'openjdk8' - - boron: - branch: 'stable/boron' - jre: 'openjdk8' - - install: - - only: - scope: 'only' - - # Features to install - install-features: 'odl-openflowplugin-flow-services-ui,odl-openflowplugin-app-table-miss-enforcer' - - # Robot custom options - robot-options: '-v MIN_SWITCHES:100 -v MAX_SWITCHES:500 -v STEP_SWITCHES:50' - - # mininet image - mininet-image: 'ubuntu-trusty-mininet-ovs-25-2c-2g' - - # 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-sw-scalability-daily-old.yaml b/jjb/openflowplugin/openflowplugin-csit-sw-scalability-daily-old.yaml index 53c4d574b..e9b87608a 100644 --- a/jjb/openflowplugin/openflowplugin-csit-sw-scalability-daily-old.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-sw-scalability-daily-old.yaml @@ -1,5 +1,5 @@ - project: - name: openflowplugin-csit-sw-scalability-daily-old + name: openflowplugin-csit-scalability-daily-old jobs: - '{project}-csit-1node-periodic-{functionality}-{install}-{stream}' @@ -20,7 +20,7 @@ scope: 'only' # Features to install - install-features: 'odl-openflowplugin-flow-services-ui' + install-features: 'odl-openflowplugin-flow-services-ui,decanter-collector-jmx,decanter-appender-elasticsearch' # Robot custom options robot-options: '' @@ -29,7 +29,11 @@ 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' + 01-plot-title: 'Maximum Switches Linear Topology' + 01-plot-yaxis: 'Switches' + 01-plot-group: 'Switch Scalability' + 01-plot-data-file: 'switches.csv' + 02-plot-title: 'Topology Discover Time' + 02-plot-yaxis: 'Seconds' + 02-plot-group: 'Switch Scalability' + 02-plot-data-file: 'time.csv' diff --git a/jjb/openflowplugin/openflowplugin-csit-sw-scalability-daily.yaml b/jjb/openflowplugin/openflowplugin-csit-sw-scalability-daily.yaml index 40d609c08..be35738ca 100644 --- a/jjb/openflowplugin/openflowplugin-csit-sw-scalability-daily.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-sw-scalability-daily.yaml @@ -1,5 +1,5 @@ - project: - name: openflowplugin-csit-sw-scalability-daily + name: openflowplugin-csit-scalability-daily jobs: - '{project}-csit-1node-periodic-{functionality}-{install}-{stream}' @@ -23,16 +23,23 @@ scope: 'only' # Features to install - install-features: 'odl-openflowplugin-flow-services-ui' + install-features: 'odl-openflowplugin-flow-services-ui,odl-openflowplugin-app-table-miss-enforcer,decanter-collector-jmx,decanter-appender-elasticsearch' # Robot custom options robot-options: '' + # mininet image + mininet-image: 'ubuntu-trusty-mininet-ovs-25-2c-2g' + # 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' + 01-plot-title: 'Maximum Switches Linear Topology' + 01-plot-yaxis: 'Switches' + 01-plot-group: 'Switch Scalability' + 01-plot-data-file: 'switches.csv' + 02-plot-title: 'Topology Discover Time' + 02-plot-yaxis: 'Seconds' + 02-plot-group: 'Switch Scalability' + 02-plot-data-file: 'time.csv'