X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fcontroller%2Fcontroller-csit-periodic-dsbenchmark.yaml;h=50c623523609fc73fdde01a65849870ca6dc46e5;hb=4aaa45a1cafdf3191f28a3885a7010fa966a6bda;hp=2762c0f35e32de4f267d7d2c80d77c074bc14604;hpb=edc942e8397d10f7b3e8a12cc796af6f3f6b0df7;p=releng%2Fbuilder.git

diff --git a/jjb/controller/controller-csit-periodic-dsbenchmark.yaml b/jjb/controller/controller-csit-periodic-dsbenchmark.yaml
index 2762c0f35..50c623523 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,34 +12,39 @@
 
     # Project branches
     stream:
-        - carbon:
-            branch: 'master'
-            jre: 'openjdk8'
-        - boron:
-            branch: 'stable/boron'
-            jre: 'openjdk8'
-        - beryllium:
-            branch: 'stable/beryllium'
-            jre: 'openjdk7'
+      - oxygen:
+          branch: 'master'
+          jre: 'openjdk8'
+      - nitrogen:
+          branch: 'stable/nitrogen'
+          jre: 'openjdk8'
+      - carbon:
+          branch: 'stable/carbon'
+          jre: 'openjdk8'
+          karaf-version: karaf3
+      - boron:
+          branch: 'stable/boron'
+          jre: 'openjdk8'
+          karaf-version: karaf3
 
     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'
+    install-features: >
+        odl-restconf,
+        odl-mdsal-benchmark,
+        odl-jolokia
 
     # Robot custom options
     robot-options: '--exclude clustered_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'
+    odl_system_flavor: 8 GB General Purpose v1
 
     # Plot Info
     01-plot-title: 'Performance by structure'
@@ -55,24 +61,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'
@@ -80,22 +90,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'