From 21a912f85f22f838b5e14a188f540ac3b0eb4f7f Mon Sep 17 00:00:00 2001 From: Peter Gubka Date: Fri, 14 Oct 2016 14:38:16 +0200 Subject: [PATCH] general improvement of published graphs for 1node and 3node controller benchmark job the main purpose is to split unreadable graphs in controller-csit-Xnode-periodic-benchmark-x-y to be merged after https://git.opendaylight.org/gerrit/#/c/47424/ Change-Id: I573518012039d99eb7db88ffdb4930cb0d496043 Signed-off-by: Peter Gubka --- ...ler-csit-periodic-dsbenchmark-cluster.yaml | 104 +++++++++ .../controller-csit-periodic-dsbenchmark.yaml | 55 ++++- jjb/integration/integration-templates.yaml | 212 +++++++++++++++++- jjb/releng-defaults.yaml | 70 +++++- 4 files changed, 425 insertions(+), 16 deletions(-) create mode 100644 jjb/controller/controller-csit-periodic-dsbenchmark-cluster.yaml diff --git a/jjb/controller/controller-csit-periodic-dsbenchmark-cluster.yaml b/jjb/controller/controller-csit-periodic-dsbenchmark-cluster.yaml new file mode 100644 index 000000000..e779e3937 --- /dev/null +++ b/jjb/controller/controller-csit-periodic-dsbenchmark-cluster.yaml @@ -0,0 +1,104 @@ +- project: + name: mdsal-csit-periodic-dsbenchmark-cluster + jobs: + - '{project}-csit-3node-periodic-{functionality}-{install}-{stream}' + + # The project name + project: 'controller' + + # The functionality under test + functionality: 'benchmark' + + # Project branches + stream: + - carbon: + branch: 'master' + jre: 'openjdk8' + - boron: + branch: 'stable/boron' + jre: 'openjdk8' + - beryllium: + branch: 'stable/beryllium' + jre: 'openjdk7' + + install: + - only: + scope: 'only' + - all: + scope: 'all' + + # Features to install + install-features: 'odl-restconf,odl-mdsal-benchmark,odl-jolokia' + + # Robot custom options + robot-options: '--exclude singlenode_setup' + + # Trigger jobs (daily) + schedule: 'H H * * *' + + # ODL system image to use + # The job uses scriptplan to set heap to 4GB, so 4GB RAM is not enough. + controller-image: 'centos7-java-builder-2c-8g' + + build-timeout: '480' + + + # Plot Info + 01-plot-title: 'Performance by structure' + 01-plot-yaxis: 'Average total time [ms]' + 01-plot-group: 'MD-SAL Data Store Performance' + 01-plot-data-file: 'perf_per_struct.csv' + 02-plot-title: 'Performance by operations' + 02-plot-yaxis: 'Average total time [ms]' + 02-plot-group: 'MD-SAL Data Store Performance' + 02-plot-data-file: 'perf_per_ops.csv' + + 03-plot-data-file: 'perf_per_struct.csv' + 03-plot-title: 'Config performance by structure PUT' + 03-plot-yaxis: 'Average total time [ms]' + 03-plot-group: 'MD-SAL Data Store Performance' + 03-inclusion-flag: 'include-by-string' + 03-exclude-value: 'CONFIG-BINDING-AWARE-SIMPLE-TX-PUT-1/100000OUTER/INNER-1OP-EXEC,CONFIG-BINDING-AWARE-TX-CHAINING-PUT-1/100000OUTER/INNER-1OP-EXEC,CONFIG-BINDING-INDEPENDENT-SIMPLE-TX-PUT-1/100000OUTER/INNER-1OP-EXEC,CONFIG-BINDING-INDEPENDENT-TX-CHAINING-PUT-1/100000OUTER/INNER-1OP-EXEC,FOL_CONFIG-BINDING-AWARE-SIMPLE-TX-PUT-1/100000OUTER/INNER-1OP-EXEC,FOL_CONFIG-BINDING-AWARE-TX-CHAINING-PUT-1/100000OUTER/INNER-1OP-EXEC,FOL_CONFIG-BINDING-INDEPENDENT-SIMPLE-TX-PUT-1/100000OUTER/INNER-1OP-EXEC,FOL_CONFIG-BINDING-INDEPENDENT-TX-CHAINING-PUT-1/100000OUTER/INNER-1OP-EXEC,FOL_OPERATIONAL-BINDING-AWARE-SIMPLE-TX-PUT-1/100000OUTER/INNER-1OP-EXEC,FOL_OPERATIONAL-BINDING-AWARE-TX-CHAINING-PUT-1/100000OUTER/INNER-1OP-EXEC,FOL_OPERATIONAL-BINDING-INDEPENDENT-SIMPLE-TX-PUT-1/100000OUTER/INNER-1OP-EXEC,FOL_OPERATIONAL-BINDING-INDEPENDENT-TX-CHAINING-PUT-1/100000OUTER/INNER-1OP-EXEC,OPERATIONAL-BINDING-AWARE-SIMPLE-TX-PUT-1/100000OUTER/INNER-1OP-EXEC,OPERATIONAL-BINDING-AWARE-TX-CHAINING-PUT-1/100000OUTER/INNER-1OP-EXEC,OPERATIONAL-BINDING-INDEPENDENT-SIMPLE-TX-PUT-1/100000OUTER/INNER-1OP-EXEC,OPERATIONAL-BINDING-INDEPENDENT-TX-CHAINING-PUT-1/100000OUTER/INNER-1OP-EXEC' + 04-plot-data-file: 'perf_per_struct.csv' + 04-plot-title: 'Config performance by structure READ' + 04-plot-yaxis: 'Average total time [ms]' + 04-plot-group: 'MD-SAL Data Store Performance' + 04-inclusion-flag: 'include-by-string' + 04-exclude-value: 'CONFIG-BINDING-AWARE-SIMPLE-TX-READ-1/100000OUTER/INNER-1OP-EXEC,CONFIG-BINDING-AWARE-TX-CHAINING-READ-1/100000OUTER/INNER-1OP-EXEC,CONFIG-BINDING-INDEPENDENT-SIMPLE-TX-READ-1/100000OUTER/INNER-1OP-EXEC,CONFIG-BINDING-INDEPENDENT-TX-CHAINING-READ-1/100000OUTER/INNER-1OP-EXEC,FOL_CONFIG-BINDING-AWARE-SIMPLE-TX-READ-1/100000OUTER/INNER-1OP-EXEC,FOL_CONFIG-BINDING-AWARE-TX-CHAINING-READ-1/100000OUTER/INNER-1OP-EXEC,FOL_CONFIG-BINDING-INDEPENDENT-SIMPLE-TX-READ-1/100000OUTER/INNER-1OP-EXEC,FOL_CONFIG-BINDING-INDEPENDENT-TX-CHAINING-READ-1/100000OUTER/INNER-1OP-EXEC,FOL_OPERATIONAL-BINDING-AWARE-SIMPLE-TX-READ-1/100000OUTER/INNER-1OP-EXEC,FOL_OPERATIONAL-BINDING-AWARE-TX-CHAINING-READ-1/100000OUTER/INNER-1OP-EXEC,FOL_OPERATIONAL-BINDING-INDEPENDENT-SIMPLE-TX-READ-1/100000OUTER/INNER-1OP-EXEC,FOL_OPERATIONAL-BINDING-INDEPENDENT-TX-CHAINING-READ-1/100000OUTER/INNER-1OP-EXEC,OPERATIONAL-BINDING-AWARE-SIMPLE-TX-READ-1/100000OUTER/INNER-1OP-EXEC,OPERATIONAL-BINDING-AWARE-TX-CHAINING-READ-1/100000OUTER/INNER-1OP-EXEC,OPERATIONAL-BINDING-INDEPENDENT-SIMPLE-TX-READ-1/100000OUTER/INNER-1OP-EXEC,OPERATIONAL-BINDING-INDEPENDENT-TX-CHAINING-READ-1/100000OUTER/INNER-1OP-EXEC' + 05-plot-data-file: 'perf_per_struct.csv' + 05-plot-title: 'Operational performance by structure MERGE' + 05-plot-yaxis: 'Average total time [ms]' + 05-plot-group: 'MD-SAL Data Store Performance' + 05-inclusion-flag: 'include-by-string' + 05-exclude-value: 'CONFIG-BINDING-AWARE-SIMPLE-TX-MERGE-1/100000OUTER/INNER-1OP-EXEC,CONFIG-BINDING-AWARE-TX-CHAINING-MERGE-1/100000OUTER/INNER-1OP-EXEC,CONFIG-BINDING-INDEPENDENT-SIMPLE-TX-MERGE-1/100000OUTER/INNER-1OP-EXEC,CONFIG-BINDING-INDEPENDENT-TX-CHAINING-MERGE-1/100000OUTER/INNER-1OP-EXEC,FOL_CONFIG-BINDING-AWARE-SIMPLE-TX-MERGE-1/100000OUTER/INNER-1OP-EXEC,FOL_CONFIG-BINDING-AWARE-TX-CHAINING-MERGE-1/100000OUTER/INNER-1OP-EXEC,FOL_CONFIG-BINDING-INDEPENDENT-SIMPLE-TX-MERGE-1/100000OUTER/INNER-1OP-EXEC,FOL_CONFIG-BINDING-INDEPENDENT-TX-CHAINING-MERGE-1/100000OUTER/INNER-1OP-EXEC,FOL_OPERATIONAL-BINDING-AWARE-SIMPLE-TX-MERGE-1/100000OUTER/INNER-1OP-EXEC,FOL_OPERATIONAL-BINDING-AWARE-TX-CHAINING-MERGE-1/100000OUTER/INNER-1OP-EXEC,FOL_OPERATIONAL-BINDING-INDEPENDENT-SIMPLE-TX-MERGE-1/100000OUTER/INNER-1OP-EXEC,FOL_OPERATIONAL-BINDING-INDEPENDENT-TX-CHAINING-MERGE-1/100000OUTER/INNER-1OP-EXEC,OPERATIONAL-BINDING-AWARE-SIMPLE-TX-MERGE-1/100000OUTER/INNER-1OP-EXEC,OPERATIONAL-BINDING-AWARE-TX-CHAINING-MERGE-1/100000OUTER/INNER-1OP-EXEC,OPERATIONAL-BINDING-INDEPENDENT-SIMPLE-TX-MERGE-1/100000OUTER/INNER-1OP-EXEC,OPERATIONAL-BINDING-INDEPENDENT-TX-CHAINING-MERGE-1/100000OUTER/INNER-1OP-EXEC' + 06-plot-data-file: 'perf_per_struct.csv' + 06-plot-title: 'Operational performance by structure DELETE' + 06-plot-yaxis: 'Average total time [ms]' + 06-plot-group: 'MD-SAL Data Store Performance' + 06-inclusion-flag: 'include-by-string' + 06-exclude-value: 'CONFIG-BINDING-AWARE-SIMPLE-TX-DELETE-1/100000OUTER/INNER-1OP-EXEC,CONFIG-BINDING-AWARE-TX-CHAINING-DELETE-1/100000OUTER/INNER-1OP-EXEC,CONFIG-BINDING-INDEPENDENT-SIMPLE-TX-DELETE-1/100000OUTER/INNER-1OP-EXEC,CONFIG-BINDING-INDEPENDENT-TX-CHAINING-DELETE-1/100000OUTER/INNER-1OP-EXEC,FOL_CONFIG-BINDING-AWARE-SIMPLE-TX-DELETE-1/100000OUTER/INNER-1OP-EXEC,FOL_CONFIG-BINDING-AWARE-TX-CHAINING-DELETE-1/100000OUTER/INNER-1OP-EXEC,FOL_CONFIG-BINDING-INDEPENDENT-SIMPLE-TX-DELETE-1/100000OUTER/INNER-1OP-EXEC,FOL_CONFIG-BINDING-INDEPENDENT-TX-CHAINING-DELETE-1/100000OUTER/INNER-1OP-EXEC,FOL_OPERATIONAL-BINDING-AWARE-SIMPLE-TX-DELETE-1/100000OUTER/INNER-1OP-EXEC,FOL_OPERATIONAL-BINDING-AWARE-TX-CHAINING-DELETE-1/100000OUTER/INNER-1OP-EXEC,FOL_OPERATIONAL-BINDING-INDEPENDENT-SIMPLE-TX-DELETE-1/100000OUTER/INNER-1OP-EXEC,FOL_OPERATIONAL-BINDING-INDEPENDENT-TX-CHAINING-DELETE-1/100000OUTER/INNER-1OP-EXEC,OPERATIONAL-BINDING-AWARE-SIMPLE-TX-DELETE-1/100000OUTER/INNER-1OP-EXEC,OPERATIONAL-BINDING-AWARE-TX-CHAINING-DELETE-1/100000OUTER/INNER-1OP-EXEC,OPERATIONAL-BINDING-INDEPENDENT-SIMPLE-TX-DELETE-1/100000OUTER/INNER-1OP-EXEC,OPERATIONAL-BINDING-INDEPENDENT-TX-CHAINING-DELETE-1/100000OUTER/INNER-1OP-EXEC' + + 07-plot-data-file: 'perf_per_ops.csv' + 07-plot-title: 'Config performance by operations PUT' + 07-plot-yaxis: 'Average total time [ms]' + 07-plot-group: 'MD-SAL Data Store Performance' + 07-inclusion-flag: 'include-by-string' + 07-exclude-value: 'CONFIG-BINDING-AWARE-SIMPLE-TX-PUT-1/1OUTER/INNER-100000OP-EXEC,CONFIG-BINDING-AWARE-TX-CHAINING-PUT-1/1OUTER/INNER-100000OP-EXEC,CONFIG-BINDING-INDEPENDENT-SIMPLE-TX-PUT-1/1OUTER/INNER-100000OP-EXEC,CONFIG-BINDING-INDEPENDENT-TX-CHAINING-PUT-1/1OUTER/INNER-100000OP-EXEC,FOL_CONFIG-BINDING-AWARE-SIMPLE-TX-PUT-1/1OUTER/INNER-100000OP-EXEC,FOL_CONFIG-BINDING-AWARE-TX-CHAINING-PUT-1/1OUTER/INNER-100000OP-EXEC,FOL_CONFIG-BINDING-INDEPENDENT-SIMPLE-TX-PUT-1/1OUTER/INNER-100000OP-EXEC,FOL_CONFIG-BINDING-INDEPENDENT-TX-CHAINING-PUT-1/1OUTER/INNER-100000OP-EXEC,FOL_OPERATIONAL-BINDING-AWARE-SIMPLE-TX-PUT-1/1OUTER/INNER-100000OP-EXEC,FOL_OPERATIONAL-BINDING-AWARE-TX-CHAINING-PUT-1/1OUTER/INNER-100000OP-EXEC,FOL_OPERATIONAL-BINDING-INDEPENDENT-SIMPLE-TX-PUT-1/1OUTER/INNER-100000OP-EXEC,FOL_OPERATIONAL-BINDING-INDEPENDENT-TX-CHAINING-PUT-1/1OUTER/INNER-100000OP-EXEC,OPERATIONAL-BINDING-AWARE-SIMPLE-TX-PUT-1/1OUTER/INNER-100000OP-EXEC,OPERATIONAL-BINDING-AWARE-TX-CHAINING-PUT-1/1OUTER/INNER-100000OP-EXEC,OPERATIONAL-BINDING-INDEPENDENT-SIMPLE-TX-PUT-1/1OUTER/INNER-100000OP-EXEC,OPERATIONAL-BINDING-INDEPENDENT-TX-CHAINING-PUT-1/1OUTER/INNER-100000OP-EXEC' + 08-plot-data-file: 'perf_per_ops.csv' + 08-plot-title: 'Config performance by operations READ' + 08-plot-yaxis: 'Average total time [ms]' + 08-plot-group: 'MD-SAL Data Store Performance' + 08-inclusion-flag: 'include-by-string' + 08-exclude-value: 'CONFIG-BINDING-AWARE-SIMPLE-TX-READ-1/1OUTER/INNER-100000OP-EXEC,CONFIG-BINDING-AWARE-TX-CHAINING-READ-1/1OUTER/INNER-100000OP-EXEC,CONFIG-BINDING-INDEPENDENT-SIMPLE-TX-READ-1/1OUTER/INNER-100000OP-EXEC,CONFIG-BINDING-INDEPENDENT-TX-CHAINING-READ-1/1OUTER/INNER-100000OP-EXEC,FOL_CONFIG-BINDING-AWARE-SIMPLE-TX-READ-1/1OUTER/INNER-100000OP-EXEC,FOL_CONFIG-BINDING-AWARE-TX-CHAINING-READ-1/1OUTER/INNER-100000OP-EXEC,FOL_CONFIG-BINDING-INDEPENDENT-SIMPLE-TX-READ-1/1OUTER/INNER-100000OP-EXEC,FOL_CONFIG-BINDING-INDEPENDENT-TX-CHAINING-READ-1/1OUTER/INNER-100000OP-EXEC,FOL_OPERATIONAL-BINDING-AWARE-SIMPLE-TX-READ-1/1OUTER/INNER-100000OP-EXEC,FOL_OPERATIONAL-BINDING-AWARE-TX-CHAINING-READ-1/1OUTER/INNER-100000OP-EXEC,FOL_OPERATIONAL-BINDING-INDEPENDENT-SIMPLE-TX-READ-1/1OUTER/INNER-100000OP-EXEC,FOL_OPERATIONAL-BINDING-INDEPENDENT-TX-CHAINING-READ-1/1OUTER/INNER-100000OP-EXEC,OPERATIONAL-BINDING-AWARE-SIMPLE-TX-READ-1/1OUTER/INNER-100000OP-EXEC,OPERATIONAL-BINDING-AWARE-TX-CHAINING-READ-1/1OUTER/INNER-100000OP-EXEC,OPERATIONAL-BINDING-INDEPENDENT-SIMPLE-TX-READ-1/1OUTER/INNER-100000OP-EXEC,OPERATIONAL-BINDING-INDEPENDENT-TX-CHAINING-READ-1/1OUTER/INNER-100000OP-EXEC' + 09-plot-data-file: 'perf_per_ops.csv' + 09-plot-title: 'Operational performance by operations MERGE' + 09-plot-yaxis: 'Average total time [ms]' + 09-plot-group: 'MD-SAL Data Store Performance' + 09-inclusion-flag: 'include-by-string' + 09-exclude-value: 'CONFIG-BINDING-AWARE-SIMPLE-TX-MERGE-1/1OUTER/INNER-100000OP-EXEC,CONFIG-BINDING-AWARE-TX-CHAINING-MERGE-1/1OUTER/INNER-100000OP-EXEC,CONFIG-BINDING-INDEPENDENT-SIMPLE-TX-MERGE-1/1OUTER/INNER-100000OP-EXEC,CONFIG-BINDING-INDEPENDENT-TX-CHAINING-MERGE-1/1OUTER/INNER-100000OP-EXEC,FOL_CONFIG-BINDING-AWARE-SIMPLE-TX-MERGE-1/1OUTER/INNER-100000OP-EXEC,FOL_CONFIG-BINDING-AWARE-TX-CHAINING-MERGE-1/1OUTER/INNER-100000OP-EXEC,FOL_CONFIG-BINDING-INDEPENDENT-SIMPLE-TX-MERGE-1/1OUTER/INNER-100000OP-EXEC,FOL_CONFIG-BINDING-INDEPENDENT-TX-CHAINING-MERGE-1/1OUTER/INNER-100000OP-EXEC,FOL_OPERATIONAL-BINDING-AWARE-SIMPLE-TX-MERGE-1/1OUTER/INNER-100000OP-EXEC,FOL_OPERATIONAL-BINDING-AWARE-TX-CHAINING-MERGE-1/1OUTER/INNER-100000OP-EXEC,FOL_OPERATIONAL-BINDING-INDEPENDENT-SIMPLE-TX-MERGE-1/1OUTER/INNER-100000OP-EXEC,FOL_OPERATIONAL-BINDING-INDEPENDENT-TX-CHAINING-MERGE-1/1OUTER/INNER-100000OP-EXEC,OPERATIONAL-BINDING-AWARE-SIMPLE-TX-MERGE-1/1OUTER/INNER-100000OP-EXEC,OPERATIONAL-BINDING-AWARE-TX-CHAINING-MERGE-1/1OUTER/INNER-100000OP-EXEC,OPERATIONAL-BINDING-INDEPENDENT-SIMPLE-TX-MERGE-1/1OUTER/INNER-100000OP-EXEC,OPERATIONAL-BINDING-INDEPENDENT-TX-CHAINING-MERGE-1/1OUTER/INNER-100000OP-EXEC' + 10-plot-data-file: 'perf_per_ops.csv' + 10-plot-title: 'Operational performance by operations DELETE' + 10-plot-yaxis: 'Average total time [ms]' + 10-plot-group: 'MD-SAL Data Store Performance' + 10-inclusion-flag: 'include-by-string' + 10-exclude-value: 'CONFIG-BINDING-AWARE-SIMPLE-TX-DELETE-1/1OUTER/INNER-100000OP-EXEC,CONFIG-BINDING-AWARE-TX-CHAINING-DELETE-1/1OUTER/INNER-100000OP-EXEC,CONFIG-BINDING-INDEPENDENT-SIMPLE-TX-DELETE-1/1OUTER/INNER-100000OP-EXEC,CONFIG-BINDING-INDEPENDENT-TX-CHAINING-DELETE-1/1OUTER/INNER-100000OP-EXEC,FOL_CONFIG-BINDING-AWARE-SIMPLE-TX-DELETE-1/1OUTER/INNER-100000OP-EXEC,FOL_CONFIG-BINDING-AWARE-TX-CHAINING-DELETE-1/1OUTER/INNER-100000OP-EXEC,FOL_CONFIG-BINDING-INDEPENDENT-SIMPLE-TX-DELETE-1/1OUTER/INNER-100000OP-EXEC,FOL_CONFIG-BINDING-INDEPENDENT-TX-CHAINING-DELETE-1/1OUTER/INNER-100000OP-EXEC,FOL_OPERATIONAL-BINDING-AWARE-SIMPLE-TX-DELETE-1/1OUTER/INNER-100000OP-EXEC,FOL_OPERATIONAL-BINDING-AWARE-TX-CHAINING-DELETE-1/1OUTER/INNER-100000OP-EXEC,FOL_OPERATIONAL-BINDING-INDEPENDENT-SIMPLE-TX-DELETE-1/1OUTER/INNER-100000OP-EXEC,FOL_OPERATIONAL-BINDING-INDEPENDENT-TX-CHAINING-DELETE-1/1OUTER/INNER-100000OP-EXEC,OPERATIONAL-BINDING-AWARE-SIMPLE-TX-DELETE-1/1OUTER/INNER-100000OP-EXEC,OPERATIONAL-BINDING-AWARE-TX-CHAINING-DELETE-1/1OUTER/INNER-100000OP-EXEC,OPERATIONAL-BINDING-INDEPENDENT-SIMPLE-TX-DELETE-1/1OUTER/INNER-100000OP-EXEC,OPERATIONAL-BINDING-INDEPENDENT-TX-CHAINING-DELETE-1/1OUTER/INNER-100000OP-EXEC' diff --git a/jjb/controller/controller-csit-periodic-dsbenchmark.yaml b/jjb/controller/controller-csit-periodic-dsbenchmark.yaml index 119b4c93a..2762c0f35 100644 --- a/jjb/controller/controller-csit-periodic-dsbenchmark.yaml +++ b/jjb/controller/controller-csit-periodic-dsbenchmark.yaml @@ -2,7 +2,6 @@ name: mdsal-csit-periodic-dsbenchmark jobs: - '{project}-csit-1node-periodic-{functionality}-{install}-{stream}' - - '{project}-csit-3node-periodic-{functionality}-{install}-{stream}' # The project name project: 'controller' @@ -29,10 +28,10 @@ scope: 'all' # Features to install - install-features: 'odl-restconf,odl-mdsal-benchmark' + install-features: 'odl-restconf,odl-mdsal-benchmark,odl-jolokia' # Robot custom options - robot-options: '' + robot-options: '--exclude clustered_setup' # Trigger jobs (daily) schedule: 'H H * * *' @@ -50,3 +49,53 @@ 02-plot-yaxis: 'Average total time [ms]' 02-plot-group: 'MD-SAL Data Store Performance' 02-plot-data-file: 'perf_per_ops.csv' + + 03-plot-data-file: 'perf_per_struct.csv' + 03-plot-title: 'Performance by structure PUT' + 03-plot-yaxis: 'Average total time [ms]' + 03-plot-group: 'MD-SAL Data Store Performance' + 03-inclusion-flag: 'include-by-string' + 03-exclude-value: 'CONFIG-BINDING-AWARE-SIMPLE-TX-PUT-1/100000OUTER/INNER-1OP-EXEC,CONFIG-BINDING-AWARE-TX-CHAINING-PUT-1/100000OUTER/INNER-1OP-EXEC,CONFIG-BINDING-INDEPENDENT-SIMPLE-TX-PUT-1/100000OUTER/INNER-1OP-EXEC,CONFIG-BINDING-INDEPENDENT-TX-CHAINING-PUT-1/100000OUTER/INNER-1OP-EXEC,OPERATIONAL-BINDING-AWARE-SIMPLE-TX-PUT-1/100000OUTER/INNER-1OP-EXEC,OPERATIONAL-BINDING-AWARE-TX-CHAINING-PUT-1/100000OUTER/INNER-1OP-EXEC,OPERATIONAL-BINDING-INDEPENDENT-SIMPLE-TX-PUT-1/100000OUTER/INNER-1OP-EXEC,OPERATIONAL-BINDING-INDEPENDENT-TX-CHAINING-PUT-1/100000OUTER/INNER-1OP-EXEC' + 04-plot-data-file: 'perf_per_struct.csv' + 04-plot-title: 'Performance by structure READ' + 04-plot-yaxis: 'Average total time [ms]' + 04-plot-group: 'MD-SAL Data Store Performance' + 04-inclusion-flag: 'include-by-string' + 04-exclude-value: 'CONFIG-BINDING-AWARE-SIMPLE-TX-READ-1/100000OUTER/INNER-1OP-EXEC,CONFIG-BINDING-AWARE-TX-CHAINING-READ-1/100000OUTER/INNER-1OP-EXEC,CONFIG-BINDING-INDEPENDENT-SIMPLE-TX-READ-1/100000OUTER/INNER-1OP-EXEC,CONFIG-BINDING-INDEPENDENT-TX-CHAINING-READ-1/100000OUTER/INNER-1OP-EXEC,OPERATIONAL-BINDING-AWARE-SIMPLE-TX-READ-1/100000OUTER/INNER-1OP-EXEC,OPERATIONAL-BINDING-AWARE-TX-CHAINING-READ-1/100000OUTER/INNER-1OP-EXEC,OPERATIONAL-BINDING-INDEPENDENT-SIMPLE-TX-READ-1/100000OUTER/INNER-1OP-EXEC,OPERATIONAL-BINDING-INDEPENDENT-TX-CHAINING-READ-1/100000OUTER/INNER-1OP-EXEC' + 05-plot-data-file: 'perf_per_struct.csv' + 05-plot-title: 'Performance by structure MERGE' + 05-plot-yaxis: 'Average total time [ms]' + 05-plot-group: 'MD-SAL Data Store Performance' + 05-inclusion-flag: 'include-by-string' + 05-exclude-value: 'CONFIG-BINDING-AWARE-SIMPLE-TX-MERGE-1/100000OUTER/INNER-1OP-EXEC,CONFIG-BINDING-AWARE-TX-CHAINING-MERGE-1/100000OUTER/INNER-1OP-EXEC,CONFIG-BINDING-INDEPENDENT-SIMPLE-TX-MERGE-1/100000OUTER/INNER-1OP-EXEC,CONFIG-BINDING-INDEPENDENT-TX-CHAINING-MERGE-1/100000OUTER/INNER-1OP-EXEC,OPERATIONAL-BINDING-AWARE-SIMPLE-TX-MERGE-1/100000OUTER/INNER-1OP-EXEC,OPERATIONAL-BINDING-AWARE-TX-CHAINING-MERGE-1/100000OUTER/INNER-1OP-EXEC,OPERATIONAL-BINDING-INDEPENDENT-SIMPLE-TX-MERGE-1/100000OUTER/INNER-1OP-EXEC,OPERATIONAL-BINDING-INDEPENDENT-TX-CHAINING-MERGE-1/100000OUTER/INNER-1OP-EXEC' + 06-plot-data-file: 'perf_per_struct.csv' + 06-plot-title: 'Performance by structure DELETE' + 06-plot-yaxis: 'Average total time [ms]' + 06-plot-group: 'MD-SAL Data Store Performance' + 06-inclusion-flag: 'include-by-string' + 06-exclude-value: 'CONFIG-BINDING-AWARE-SIMPLE-TX-DELETE-1/100000OUTER/INNER-1OP-EXEC,CONFIG-BINDING-AWARE-TX-CHAINING-DELETE-1/100000OUTER/INNER-1OP-EXEC,CONFIG-BINDING-INDEPENDENT-SIMPLE-TX-DELETE-1/100000OUTER/INNER-1OP-EXEC,CONFIG-BINDING-INDEPENDENT-TX-CHAINING-DELETE-1/100000OUTER/INNER-1OP-EXEC,OPERATIONAL-BINDING-AWARE-SIMPLE-TX-DELETE-1/100000OUTER/INNER-1OP-EXEC,OPERATIONAL-BINDING-AWARE-TX-CHAINING-DELETE-1/100000OUTER/INNER-1OP-EXEC,OPERATIONAL-BINDING-INDEPENDENT-SIMPLE-TX-DELETE-1/100000OUTER/INNER-1OP-EXEC,OPERATIONAL-BINDING-INDEPENDENT-TX-CHAINING-DELETE-1/100000OUTER/INNER-1OP-EXEC' + + 07-plot-data-file: 'perf_per_ops.csv' + 07-plot-title: 'Performance by operations PUT' + 07-plot-yaxis: 'Average total time [ms]' + 07-plot-group: 'MD-SAL Data Store Performance' + 07-inclusion-flag: 'include-by-string' + 07-exclude-value: 'CONFIG-BINDING-AWARE-SIMPLE-TX-PUT-1/1OUTER/INNER-100000OP-EXEC,CONFIG-BINDING-AWARE-TX-CHAINING-PUT-1/1OUTER/INNER-100000OP-EXEC,CONFIG-BINDING-INDEPENDENT-SIMPLE-TX-PUT-1/1OUTER/INNER-100000OP-EXEC,CONFIG-BINDING-INDEPENDENT-TX-CHAINING-PUT-1/1OUTER/INNER-100000OP-EXEC,OPERATIONAL-BINDING-AWARE-SIMPLE-TX-PUT-1/1OUTER/INNER-100000OP-EXEC,OPERATIONAL-BINDING-AWARE-TX-CHAINING-PUT-1/1OUTER/INNER-100000OP-EXEC,OPERATIONAL-BINDING-INDEPENDENT-SIMPLE-TX-PUT-1/1OUTER/INNER-100000OP-EXEC,OPERATIONAL-BINDING-INDEPENDENT-TX-CHAINING-PUT-1/1OUTER/INNER-100000OP-EXEC' + 08-plot-data-file: 'perf_per_ops.csv' + 08-plot-title: 'Performance by operations READ' + 08-plot-yaxis: 'Average total time [ms]' + 08-plot-group: 'MD-SAL Data Store Performance' + 08-inclusion-flag: 'include-by-string' + 08-exclude-value: 'CONFIG-BINDING-AWARE-SIMPLE-TX-READ-1/1OUTER/INNER-100000OP-EXEC,CONFIG-BINDING-AWARE-TX-CHAINING-READ-1/1OUTER/INNER-100000OP-EXEC,CONFIG-BINDING-INDEPENDENT-SIMPLE-TX-READ-1/1OUTER/INNER-100000OP-EXEC,CONFIG-BINDING-INDEPENDENT-TX-CHAINING-READ-1/1OUTER/INNER-100000OP-EXEC,OPERATIONAL-BINDING-AWARE-SIMPLE-TX-READ-1/1OUTER/INNER-100000OP-EXEC,OPERATIONAL-BINDING-AWARE-TX-CHAINING-READ-1/1OUTER/INNER-100000OP-EXEC,OPERATIONAL-BINDING-INDEPENDENT-SIMPLE-TX-READ-1/1OUTER/INNER-100000OP-EXEC,OPERATIONAL-BINDING-INDEPENDENT-TX-CHAINING-READ-1/1OUTER/INNER-100000OP-EXEC' + 09-plot-data-file: 'perf_per_ops.csv' + 09-plot-title: 'Performance by operations MERGE' + 09-plot-yaxis: 'Average total time [ms]' + 09-plot-group: 'MD-SAL Data Store Performance' + 09-inclusion-flag: 'include-by-string' + 09-exclude-value: 'CONFIG-BINDING-AWARE-SIMPLE-TX-MERGE-1/1OUTER/INNER-100000OP-EXEC,CONFIG-BINDING-AWARE-TX-CHAINING-MERGE-1/1OUTER/INNER-100000OP-EXEC,CONFIG-BINDING-INDEPENDENT-SIMPLE-TX-MERGE-1/1OUTER/INNER-100000OP-EXEC,CONFIG-BINDING-INDEPENDENT-TX-CHAINING-MERGE-1/1OUTER/INNER-100000OP-EXEC,OPERATIONAL-BINDING-AWARE-SIMPLE-TX-MERGE-1/1OUTER/INNER-100000OP-EXEC,OPERATIONAL-BINDING-AWARE-TX-CHAINING-MERGE-1/1OUTER/INNER-100000OP-EXEC,OPERATIONAL-BINDING-INDEPENDENT-SIMPLE-TX-MERGE-1/1OUTER/INNER-100000OP-EXEC,OPERATIONAL-BINDING-INDEPENDENT-TX-CHAINING-MERGE-1/1OUTER/INNER-100000OP-EXEC' + 10-plot-data-file: 'perf_per_ops.csv' + 10-plot-title: 'Performance by operations DELETE' + 10-plot-yaxis: 'Average total time [ms]' + 10-plot-group: 'MD-SAL Data Store Performance' + 10-inclusion-flag: 'include-by-string' + 10-exclude-value: 'CONFIG-BINDING-AWARE-SIMPLE-TX-DELETE-1/1OUTER/INNER-100000OP-EXEC,CONFIG-BINDING-AWARE-TX-CHAINING-DELETE-1/1OUTER/INNER-100000OP-EXEC,CONFIG-BINDING-INDEPENDENT-SIMPLE-TX-DELETE-1/1OUTER/INNER-100000OP-EXEC,CONFIG-BINDING-INDEPENDENT-TX-CHAINING-DELETE-1/1OUTER/INNER-100000OP-EXEC,OPERATIONAL-BINDING-AWARE-SIMPLE-TX-DELETE-1/1OUTER/INNER-100000OP-EXEC,OPERATIONAL-BINDING-AWARE-TX-CHAINING-DELETE-1/1OUTER/INNER-100000OP-EXEC,OPERATIONAL-BINDING-INDEPENDENT-SIMPLE-TX-DELETE-1/1OUTER/INNER-100000OP-EXEC,OPERATIONAL-BINDING-INDEPENDENT-TX-CHAINING-DELETE-1/1OUTER/INNER-100000OP-EXEC' diff --git a/jjb/integration/integration-templates.yaml b/jjb/integration/integration-templates.yaml index 3a6e64c99..98a219757 100644 --- a/jjb/integration/integration-templates.yaml +++ b/jjb/integration/integration-templates.yaml @@ -325,6 +325,110 @@ inclusion-flag: 'off' display-table: true format: csv + - title: '{03-plot-title}' + yaxis: '{03-plot-yaxis}' + group: '{03-plot-group}' + num-builds: '180' + keep-records: true + style: line + use-description: false + csv-file-name: '{project}-csit-1node-periodic-{functionality}-{install}-{stream}-{03-plot-data-file}-03-history.csv' + series: + - file: '{03-plot-data-file}' + inclusion-flag: '{03-inclusion-flag}' + exclude: '{03-exclude-value}' + format: csv + - title: '{04-plot-title}' + yaxis: '{04-plot-yaxis}' + group: '{04-plot-group}' + num-builds: '180' + keep-records: true + style: line + use-description: false + csv-file-name: '{project}-csit-1node-periodic-{functionality}-{install}-{stream}-{04-plot-data-file}-04-history.csv' + series: + - file: '{04-plot-data-file}' + inclusion-flag: '{04-inclusion-flag}' + exclude: '{04-exclude-value}' + format: csv + - title: '{05-plot-title}' + yaxis: '{05-plot-yaxis}' + group: '{05-plot-group}' + num-builds: '180' + keep-records: true + style: line + use-description: false + csv-file-name: '{project}-csit-1node-periodic-{functionality}-{install}-{stream}-{05-plot-data-file}-05-history.csv' + series: + - file: '{05-plot-data-file}' + inclusion-flag: '{05-inclusion-flag}' + exclude: '{05-exclude-value}' + format: csv + - title: '{06-plot-title}' + yaxis: '{06-plot-yaxis}' + group: '{06-plot-group}' + num-builds: '180' + keep-records: true + style: line + use-description: false + csv-file-name: '{project}-csit-1node-periodic-{functionality}-{install}-{stream}-{06-plot-data-file}-06-history.csv' + series: + - file: '{06-plot-data-file}' + inclusion-flag: '{06-inclusion-flag}' + exclude: '{06-exclude-value}' + format: csv + - title: '{07-plot-title}' + yaxis: '{07-plot-yaxis}' + group: '{07-plot-group}' + num-builds: '180' + keep-records: true + style: line + use-description: false + csv-file-name: '{project}-csit-1node-periodic-{functionality}-{install}-{stream}-{07-plot-data-file}-07-history.csv' + series: + - file: '{07-plot-data-file}' + inclusion-flag: '{07-inclusion-flag}' + exclude: '{07-exclude-value}' + format: csv + - title: '{08-plot-title}' + yaxis: '{08-plot-yaxis}' + group: '{08-plot-group}' + num-builds: '180' + keep-records: true + style: line + use-description: false + csv-file-name: '{project}-csit-1node-periodic-{functionality}-{install}-{stream}-{08-plot-data-file}-08-history.csv' + series: + - file: '{08-plot-data-file}' + inclusion-flag: '{08-inclusion-flag}' + exclude: '{08-exclude-value}' + format: csv + - title: '{09-plot-title}' + yaxis: '{09-plot-yaxis}' + group: '{09-plot-group}' + num-builds: '180' + keep-records: true + style: line + use-description: false + csv-file-name: '{project}-csit-1node-periodic-{functionality}-{install}-{stream}-{09-plot-data-file}-09-history.csv' + series: + - file: '{09-plot-data-file}' + inclusion-flag: '{09-inclusion-flag}' + exclude: '{09-exclude-value}' + format: csv + - title: '{10-plot-title}' + yaxis: '{10-plot-yaxis}' + group: '{10-plot-group}' + num-builds: '180' + keep-records: true + style: line + use-description: false + csv-file-name: '{project}-csit-1node-periodic-{functionality}-{install}-{stream}-{10-plot-data-file}-10-history.csv' + series: + - file: '{10-plot-data-file}' + inclusion-flag: '{10-inclusion-flag}' + exclude: '{10-exclude-value}' + format: csv - integration-csit-archive-build - opendaylight-infra-shiplogs: maven-version: 'mvn33' @@ -722,7 +826,7 @@ - title: '{01-plot-title}' yaxis: '{01-plot-yaxis}' group: '{01-plot-group}' - num-builds: '5400' + num-builds: '180' keep-records: true style: line use-description: false @@ -735,7 +839,7 @@ - title: '{02-plot-title}' yaxis: '{02-plot-yaxis}' group: '{02-plot-group}' - num-builds: '5400' + num-builds: '180' keep-records: true style: line use-description: false @@ -745,6 +849,110 @@ inclusion-flag: 'off' display-table: true format: csv + - title: '{03-plot-title}' + yaxis: '{03-plot-yaxis}' + group: '{03-plot-group}' + num-builds: '180' + keep-records: true + style: line + use-description: false + csv-file-name: '{project}-csit-3node-periodic-{functionality}-{install}-{stream}-{03-plot-data-file}-03-history.csv' + series: + - file: '{03-plot-data-file}' + inclusion-flag: '{03-inclusion-flag}' + exclude: '{03-exclude-value}' + format: csv + - title: '{04-plot-title}' + yaxis: '{04-plot-yaxis}' + group: '{04-plot-group}' + num-builds: '180' + keep-records: true + style: line + use-description: false + csv-file-name: '{project}-csit-3node-periodic-{functionality}-{install}-{stream}-{04-plot-data-file}-04-history.csv' + series: + - file: '{04-plot-data-file}' + inclusion-flag: '{04-inclusion-flag}' + exclude: '{04-exclude-value}' + format: csv + - title: '{05-plot-title}' + yaxis: '{05-plot-yaxis}' + group: '{05-plot-group}' + num-builds: '180' + keep-records: true + style: line + use-description: false + csv-file-name: '{project}-csit-3node-periodic-{functionality}-{install}-{stream}-{05-plot-data-file}-05-history.csv' + series: + - file: '{05-plot-data-file}' + inclusion-flag: '{05-inclusion-flag}' + exclude: '{05-exclude-value}' + format: csv + - title: '{06-plot-title}' + yaxis: '{06-plot-yaxis}' + group: '{06-plot-group}' + num-builds: '180' + keep-records: true + style: line + use-description: false + csv-file-name: '{project}-csit-3node-periodic-{functionality}-{install}-{stream}-{06-plot-data-file}-06-history.csv' + series: + - file: '{06-plot-data-file}' + inclusion-flag: '{06-inclusion-flag}' + exclude: '{06-exclude-value}' + format: csv + - title: '{07-plot-title}' + yaxis: '{07-plot-yaxis}' + group: '{07-plot-group}' + num-builds: '180' + keep-records: true + style: line + use-description: false + csv-file-name: '{project}-csit-3node-periodic-{functionality}-{install}-{stream}-{07-plot-data-file}-07-history.csv' + series: + - file: '{07-plot-data-file}' + inclusion-flag: '{07-inclusion-flag}' + exclude: '{07-exclude-value}' + format: csv + - title: '{08-plot-title}' + yaxis: '{08-plot-yaxis}' + group: '{08-plot-group}' + num-builds: '180' + keep-records: true + style: line + use-description: false + csv-file-name: '{project}-csit-3node-periodic-{functionality}-{install}-{stream}-{08-plot-data-file}-08-history.csv' + series: + - file: '{08-plot-data-file}' + inclusion-flag: '{08-inclusion-flag}' + exclude: '{08-exclude-value}' + format: csv + - title: '{09-plot-title}' + yaxis: '{09-plot-yaxis}' + group: '{09-plot-group}' + num-builds: '180' + keep-records: true + style: line + use-description: false + csv-file-name: '{project}-csit-3node-periodic-{functionality}-{install}-{stream}-{09-plot-data-file}-09-history.csv' + series: + - file: '{09-plot-data-file}' + inclusion-flag: '{09-inclusion-flag}' + exclude: '{09-exclude-value}' + format: csv + - title: '{10-plot-title}' + yaxis: '{10-plot-yaxis}' + group: '{10-plot-group}' + num-builds: '180' + keep-records: true + style: line + use-description: false + csv-file-name: '{project}-csit-3node-periodic-{functionality}-{install}-{stream}-{10-plot-data-file}-10-history.csv' + series: + - file: '{10-plot-data-file}' + inclusion-flag: '{10-inclusion-flag}' + exclude: '{10-exclude-value}' + format: csv - integration-csit-archive-build - opendaylight-infra-shiplogs: maven-version: 'mvn33' diff --git a/jjb/releng-defaults.yaml b/jjb/releng-defaults.yaml index 875b6c078..85bc3b81a 100644 --- a/jjb/releng-defaults.yaml +++ b/jjb/releng-defaults.yaml @@ -15,17 +15,7 @@ archive-artifacts: '' branch: master - # Plot configuration - 01-plot-title: '' - 01-plot-yaxis: '' - 01-plot-group: 'Default Plot Group' - 01-plot-data-file: 'plot-data.csv' - 02-plot-title: '' - 02-plot-yaxis: '' - 02-plot-group: 'Default Plot Group' - 02-plot-data-file: 'plot-data.csv' - - # CSIT images configuration + # CSIT images configuration controller-image: 'centos7-java-builder-2c-4g' openstack-image: 'centos7-devstack-2c-8g' mininet-image: 'ubuntu-trusty-mininet-2c-2g' @@ -37,3 +27,61 @@ # Python toxdir: '' + + # Plot configuration + 01-plot-title: '' + 01-plot-yaxis: '' + 01-plot-group: 'Default Plot Group' + 01-plot-data-file: 'plot-data.csv' + 02-plot-title: '' + 02-plot-yaxis: '' + 02-plot-group: 'Default Plot Group' + 02-plot-data-file: 'plot-data.csv' + 03-plot-data-file: '03-nonexisting.csv' + 03-plot-title: '' + 03-plot-yaxis: '' + 03-plot-group: '' + 03-inclusion-flag: 'off' + 03-exclude-value: '' + 04-plot-data-file: '04-nonexisting.csv' + 04-plot-title: '' + 04-plot-yaxis: '' + 04-plot-group: '' + 04-inclusion-flag: 'off' + 04-exclude-value: '' + 05-plot-data-file: '05-nonexisting.csv' + 05-plot-title: '' + 05-plot-yaxis: '' + 05-plot-group: '' + 05-inclusion-flag: 'off' + 05-exclude-value: '' + 06-plot-data-file: '06-nonexisting.csv' + 06-plot-title: '' + 06-plot-yaxis: '' + 06-plot-group: '' + 06-inclusion-flag: 'off' + 06-exclude-value: '' + 07-plot-data-file: '07-nonexisting.csv' + 07-plot-title: '' + 07-plot-yaxis: '' + 07-plot-group: '' + 07-inclusion-flag: 'off' + 07-exclude-value: '' + 08-plot-data-file: '08-nonexisting.csv' + 08-plot-title: '' + 08-plot-yaxis: '' + 08-plot-group: '' + 08-inclusion-flag: 'off' + 08-exclude-value: '' + 09-plot-data-file: '09-nonexisting.csv' + 09-plot-title: '' + 09-plot-yaxis: '' + 09-plot-group: '' + 09-inclusion-flag: 'off' + 09-exclude-value: '' + 10-plot-data-file: '10-nonexisting.csv' + 10-plot-title: '' + 10-plot-yaxis: '' + 10-plot-group: '' + 10-inclusion-flag: 'off' + 10-exclude-value: '' -- 2.36.6