From 6f5ae21f3fbcc53a3fe5ed2ba7c32dd302382071 Mon Sep 17 00:00:00 2001 From: Thanh Ha Date: Wed, 1 Mar 2017 00:46:54 -0500 Subject: [PATCH] Fix yamllint for controller Preparation for patch Icd1b8d4931e15b77ee29aa179422cd652e43f2e5 Change-Id: Ic1521c001d9cf4ae9a8b2ae1d84f7a4da908d525 Signed-off-by: Thanh Ha --- jjb/controller/controller-csit-akka1.yaml | 29 ++++----- .../controller-csit-clustering.yaml | 31 +++++----- ...ler-csit-periodic-dsbenchmark-cluster.yaml | 38 +++++++----- .../controller-csit-periodic-dsbenchmark.yaml | 37 +++++++----- .../controller-csit-rest-cars-perf.yaml | 29 ++++----- .../controller-csit-rest-clust-cars-perf.yaml | 25 ++++---- jjb/controller/controller.yaml | 59 ++++++++++--------- 7 files changed, 135 insertions(+), 113 deletions(-) diff --git a/jjb/controller/controller-csit-akka1.yaml b/jjb/controller/controller-csit-akka1.yaml index 091cdc627..f4857434d 100644 --- a/jjb/controller/controller-csit-akka1.yaml +++ b/jjb/controller/controller-csit-akka1.yaml @@ -1,7 +1,8 @@ +--- - project: name: controller-csit-akka1 jobs: - - '{project}-csit-1node-{functionality}-{install}-{stream}' + - '{project}-csit-1node-{functionality}-{install}-{stream}' # The project name project: 'controller' @@ -11,21 +12,21 @@ # Project branches. Boron for actual testing, Beryllium for sanity. stream: - - carbon: - branch: 'master' - jre: 'openjdk8' - - boron: - branch: 'stable/boron' - jre: 'openjdk8' - - beryllium: - branch: 'stable/beryllium' - jre: 'openjdk7' + - carbon: + branch: 'master' + jre: 'openjdk8' + - boron: + branch: 'stable/boron' + jre: 'openjdk8' + - beryllium: + branch: 'stable/beryllium' + jre: 'openjdk7' install: - - only: - scope: 'only' - - all: - scope: 'all' + - only: + scope: 'only' + - all: + scope: 'all' # No tools system VMs needed in for this job tools_system_count: 0 diff --git a/jjb/controller/controller-csit-clustering.yaml b/jjb/controller/controller-csit-clustering.yaml index 72371b93a..b81be3924 100644 --- a/jjb/controller/controller-csit-clustering.yaml +++ b/jjb/controller/controller-csit-clustering.yaml @@ -1,8 +1,9 @@ +--- - project: name: controller-csit-clustering jobs: - - '{project}-csit-3node-{functionality}-{install}-{stream}' - - '{project}-csit-verify-3node-{functionality}' + - '{project}-csit-3node-{functionality}-{install}-{stream}' + - '{project}-csit-verify-3node-{functionality}' # The project name project: 'controller' @@ -12,21 +13,21 @@ # Project branches stream: - - carbon: - branch: 'master' - jre: 'openjdk8' - - boron: - branch: 'stable/boron' - jre: 'openjdk8' - - beryllium: - branch: 'stable/beryllium' - jre: 'openjdk7' + - carbon: + branch: 'master' + jre: 'openjdk8' + - boron: + branch: 'stable/boron' + jre: 'openjdk8' + - beryllium: + branch: 'stable/beryllium' + jre: 'openjdk7' install: - - only: - scope: 'only' - - all: - scope: 'all' + - only: + scope: 'only' + - all: + scope: 'all' # No tools system VMs needed in JCloud configuration tools_system_count: 0 diff --git a/jjb/controller/controller-csit-periodic-dsbenchmark-cluster.yaml b/jjb/controller/controller-csit-periodic-dsbenchmark-cluster.yaml index 903945843..6fb5d6e24 100644 --- a/jjb/controller/controller-csit-periodic-dsbenchmark-cluster.yaml +++ b/jjb/controller/controller-csit-periodic-dsbenchmark-cluster.yaml @@ -1,7 +1,8 @@ +--- - project: name: mdsal-csit-periodic-dsbenchmark-cluster jobs: - - '{project}-csit-3node-periodic-{functionality}-{install}-{stream}' + - '{project}-csit-3node-periodic-{functionality}-{install}-{stream}' # The project name project: 'controller' @@ -11,21 +12,21 @@ # Project branches stream: - - carbon: - branch: 'master' - jre: 'openjdk8' - - boron: - branch: 'stable/boron' - jre: 'openjdk8' - - beryllium: - branch: 'stable/beryllium' - jre: 'openjdk7' + - carbon: + branch: 'master' + jre: 'openjdk8' + - boron: + branch: 'stable/boron' + jre: 'openjdk8' + - beryllium: + branch: 'stable/beryllium' + jre: 'openjdk7' install: - - only: - scope: 'only' - - all: - scope: 'all' + - only: + scope: 'only' + - all: + scope: 'all' # Features to install install-features: 'odl-restconf,odl-mdsal-benchmark,odl-jolokia' @@ -39,7 +40,6 @@ build-timeout: '480' - # Plot Info 01-plot-title: 'Performance by structure' 01-plot-yaxis: 'Average total time [ms]' @@ -55,24 +55,28 @@ 03-plot-yaxis: 'Average total time [ms]' 03-plot-group: 'MD-SAL Data Store Performance' 03-inclusion-flag: 'include-by-string' + # yamllint disable-line rule:line-length 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' + # yamllint disable-line rule:line-length 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' + # yamllint disable-line rule:line-length 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' + # yamllint disable-line rule:line-length 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' @@ -80,22 +84,26 @@ 07-plot-yaxis: 'Average total time [ms]' 07-plot-group: 'MD-SAL Data Store Performance' 07-inclusion-flag: 'include-by-string' + # yamllint disable-line rule:line-length 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' + # yamllint disable-line rule:line-length 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' + # yamllint disable-line rule:line-length 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' + # yamllint disable-line rule:line-length 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 1d37f3adb..1c67a7443 100644 --- a/jjb/controller/controller-csit-periodic-dsbenchmark.yaml +++ b/jjb/controller/controller-csit-periodic-dsbenchmark.yaml @@ -1,7 +1,8 @@ +--- - project: name: mdsal-csit-periodic-dsbenchmark jobs: - - '{project}-csit-1node-periodic-{functionality}-{install}-{stream}' + - '{project}-csit-1node-periodic-{functionality}-{install}-{stream}' # The project name project: 'controller' @@ -11,21 +12,21 @@ # Project branches stream: - - carbon: - branch: 'master' - jre: 'openjdk8' - - boron: - branch: 'stable/boron' - jre: 'openjdk8' - - beryllium: - branch: 'stable/beryllium' - jre: 'openjdk7' + - carbon: + branch: 'master' + jre: 'openjdk8' + - boron: + branch: 'stable/boron' + jre: 'openjdk8' + - beryllium: + branch: 'stable/beryllium' + jre: 'openjdk7' install: - - only: - scope: 'only' - - all: - scope: 'all' + - only: + scope: 'only' + - all: + scope: 'all' # Features to install install-features: 'odl-restconf,odl-mdsal-benchmark,odl-jolokia' @@ -52,24 +53,28 @@ 03-plot-yaxis: 'Average total time [ms]' 03-plot-group: 'MD-SAL Data Store Performance' 03-inclusion-flag: 'include-by-string' + # yamllint disable-line rule:line-length 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' + # yamllint disable-line rule:line-length 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' + # yamllint disable-line rule:line-length 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' + # yamllint disable-line rule:line-length 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' @@ -77,22 +82,26 @@ 07-plot-yaxis: 'Average total time [ms]' 07-plot-group: 'MD-SAL Data Store Performance' 07-inclusion-flag: 'include-by-string' + # yamllint disable-line rule:line-length 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' + # yamllint disable-line rule:line-length 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' + # yamllint disable-line rule:line-length 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' + # yamllint disable-line rule:line-length 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/controller/controller-csit-rest-cars-perf.yaml b/jjb/controller/controller-csit-rest-cars-perf.yaml index 303722338..96d3eceec 100644 --- a/jjb/controller/controller-csit-rest-cars-perf.yaml +++ b/jjb/controller/controller-csit-rest-cars-perf.yaml @@ -1,7 +1,8 @@ +--- - project: name: controller-csit-rest-cars-perf jobs: - - '{project}-csit-1node-{functionality}-{install}-{stream}' + - '{project}-csit-1node-{functionality}-{install}-{stream}' # The project name project: 'controller' @@ -11,21 +12,21 @@ # Project branches stream: - - carbon: - branch: 'master' - jre: 'openjdk8' - - boron: - branch: 'stable/boron' - jre: 'openjdk8' - - beryllium: - branch: 'stable/beryllium' - jre: 'openjdk7' + - carbon: + branch: 'master' + jre: 'openjdk8' + - boron: + branch: 'stable/boron' + jre: 'openjdk8' + - beryllium: + branch: 'stable/beryllium' + jre: 'openjdk7' install: - - only: - scope: 'only' - - all: - scope: 'all' + - only: + scope: 'only' + - all: + scope: 'all' # Features to install install-features: 'odl-restconf,odl-clustering-test-app' diff --git a/jjb/controller/controller-csit-rest-clust-cars-perf.yaml b/jjb/controller/controller-csit-rest-clust-cars-perf.yaml index 3b4596adf..c5218ce60 100644 --- a/jjb/controller/controller-csit-rest-clust-cars-perf.yaml +++ b/jjb/controller/controller-csit-rest-clust-cars-perf.yaml @@ -1,7 +1,8 @@ +--- - project: name: controller-csit-rest-clust-cars-perf jobs: - - '{project}-csit-3node-{functionality}-{install}-{stream}' + - '{project}-csit-3node-{functionality}-{install}-{stream}' # The project name project: 'controller' @@ -11,19 +12,19 @@ # Project branches stream: - - carbon: - branch: 'master' - jre: 'openjdk8' - - boron: - branch: 'stable/boron' - jre: 'openjdk8' - - beryllium: - branch: 'stable/beryllium' - jre: 'openjdk7' + - carbon: + branch: 'master' + jre: 'openjdk8' + - boron: + branch: 'stable/boron' + jre: 'openjdk8' + - beryllium: + branch: 'stable/beryllium' + jre: 'openjdk7' install: - - only: - scope: 'only' + - only: + scope: 'only' # Features to install install-features: 'odl-restconf,odl-clustering-test-app' diff --git a/jjb/controller/controller.yaml b/jjb/controller/controller.yaml index f9debfbb7..cfb0d9081 100644 --- a/jjb/controller/controller.yaml +++ b/jjb/controller/controller.yaml @@ -1,12 +1,13 @@ +--- - project: name: controller-carbon jobs: - - '{project-name}-clm-{stream}' - - '{project-name}-distribution-check-{stream}' - - '{project-name}-integration-{stream}' - - '{project-name}-merge-{stream}' - - '{project-name}-validate-autorelease-{stream}' - - '{project-name}-verify-{stream}-{maven}-{jdks}' + - '{project-name}-clm-{stream}' + - '{project-name}-distribution-check-{stream}' + - '{project-name}-integration-{stream}' + - '{project-name}-merge-{stream}' + - '{project-name}-validate-autorelease-{stream}' + - '{project-name}-verify-{stream}-{maven}-{jdks}' stream: carbon project: 'controller' @@ -14,10 +15,10 @@ branch: 'master' jdk: openjdk8 jdks: - - openjdk8 + - openjdk8 maven: - - mvn33: - mvn-version: 'mvn33' + - mvn33: + mvn-version: 'mvn33' mvn-settings: 'controller-settings' mvn-goals: 'clean install -Pintegrationtests,docs' mvn-opts: '-Xmx4096m -XX:MaxPermSize=1024m -Dmaven.compile.fork=true' @@ -28,12 +29,12 @@ - project: name: controller-boron jobs: - - '{project-name}-clm-{stream}' - - '{project-name}-distribution-check-{stream}' - - '{project-name}-integration-{stream}' - - '{project-name}-merge-{stream}' - - '{project-name}-validate-autorelease-{stream}' - - '{project-name}-verify-{stream}-{maven}-{jdks}' + - '{project-name}-clm-{stream}' + - '{project-name}-distribution-check-{stream}' + - '{project-name}-integration-{stream}' + - '{project-name}-merge-{stream}' + - '{project-name}-validate-autorelease-{stream}' + - '{project-name}-verify-{stream}-{maven}-{jdks}' stream: boron project: 'controller' @@ -41,10 +42,10 @@ branch: 'stable/boron' jdk: openjdk8 jdks: - - openjdk8 + - openjdk8 maven: - - mvn33: - mvn-version: 'mvn33' + - mvn33: + mvn-version: 'mvn33' mvn-settings: 'controller-settings' mvn-goals: 'clean install -Pintegrationtests,docs' mvn-opts: '-Xmx4096m -XX:MaxPermSize=1024m -Dmaven.compile.fork=true' @@ -55,12 +56,12 @@ - project: name: controller-beryllium jobs: - - '{project-name}-clm-{stream}' - - '{project-name}-distribution-check-{stream}' - - '{project-name}-integration-{stream}' - - '{project-name}-merge-{stream}' - - '{project-name}-validate-autorelease-{stream}' - - '{project-name}-verify-{stream}-{maven}-{jdks}' + - '{project-name}-clm-{stream}' + - '{project-name}-distribution-check-{stream}' + - '{project-name}-integration-{stream}' + - '{project-name}-merge-{stream}' + - '{project-name}-validate-autorelease-{stream}' + - '{project-name}-verify-{stream}-{maven}-{jdks}' stream: beryllium project: 'controller' @@ -68,11 +69,11 @@ branch: 'stable/beryllium' jdk: openjdk7 jdks: - - openjdk7 - - openjdk8 + - openjdk7 + - openjdk8 maven: - - mvn33: - mvn-version: 'mvn33' + - mvn33: + mvn-version: 'mvn33' mvn-settings: 'controller-settings' mvn-goals: 'clean install -Pintegrationtests,docs' mvn-opts: '-Xmx4096m -XX:MaxPermSize=1024m -Dmaven.compile.fork=true' @@ -83,7 +84,7 @@ - project: name: controller-sonar jobs: - - '{project-name}-sonar' + - '{project-name}-sonar' project: 'controller' project-name: 'controller' -- 2.36.6