Remove -periodic- CSIT jobs

Historically we had this to differentiate between merge and
daily trigger, now there is no need and it is also confusing.

Note that job history of -periodic- jobs will be lost so the
beginning of release cycle is best time for this.

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

diff --git a/jjb/bgpcep/bgpcep-csit-bgp-ingest-mixed.yaml b/jjb/bgpcep/bgpcep-csit-bgp-ingest-mixed.yaml
index 16976ff6a050e5630311079d77fad14bf8b254ae..e2a60ac03a6d9ae3133d3d3917869c97c9656321 100644 (file)
--- a/jjb/bgpcep/bgpcep-csit-bgp-ingest-mixed.yaml
+++ b/jjb/bgpcep/bgpcep-csit-bgp-ingest-mixed.yaml
@@ -2,7 +2,7 @@
 - project:
     name: bgpcep-csit-bgp-ingest-mixed
     jobs:
-      - inttest-csit-1node-periodic
+      - inttest-csit-1node
       # FIXME: Rename job to drop -periodic- and unify job definition with -gate- functionality.
 
     # The project name

diff --git a/jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml b/jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml
index b61c1b819722690a64237c6d4493ba4a23db39de..06751ca0f975d89454b28d65671a0b968b2cbc7a 100644 (file)
--- a/jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml
+++ b/jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml
@@ -2,7 +2,7 @@
 - project:
     name: bgpcep-csit-bgp-ingest
     jobs:
-      - inttest-csit-1node-periodic
+      - inttest-csit-1node
       # FIXME: Dicument differences from -mixed- and unify into single (matrix) definition.
 
     # The project name

diff --git a/jjb/bgpcep/bgpcep-csit-bgpclustering-ha.yaml b/jjb/bgpcep/bgpcep-csit-bgpclustering-ha.yaml
index 7521007347bedf0bf86b78f913744d040e1f6c68..137abb967c639bcbf853476298f40e0f43a60b9b 100644 (file)
--- a/jjb/bgpcep/bgpcep-csit-bgpclustering-ha.yaml
+++ b/jjb/bgpcep/bgpcep-csit-bgpclustering-ha.yaml
@@ -2,7 +2,7 @@
 - project:
     name: bgpcep-csit-bgpclustering-ha
     jobs:
-      - inttest-csit-3node-periodic
+      - inttest-csit-3node
 
     # The project name
     project: 'bgpcep'

diff --git a/jjb/bgpcep/bgpcep-csit-bgpclustering.yaml b/jjb/bgpcep/bgpcep-csit-bgpclustering.yaml
index 96f954631a801c760960879cf002850027e913dd..60903eb61c277ad3e1edd55404ce69eb10eea2d5 100644 (file)
--- a/jjb/bgpcep/bgpcep-csit-bgpclustering.yaml
+++ b/jjb/bgpcep/bgpcep-csit-bgpclustering.yaml
@@ -2,7 +2,7 @@
 - project:
     name: bgpcep-csit-bgpclustering
     jobs:
-      - inttest-csit-3node-periodic
+      - inttest-csit-3node
 
     # The project name
     project: 'bgpcep'

diff --git a/jjb/bgpcep/bgpcep-csit-throughpcep.yaml b/jjb/bgpcep/bgpcep-csit-throughpcep.yaml
index 39e0958293ad32d57a7a6f6c3bc6d6d56f6ae169..000cf14bed98fc01b656e288325615e5c2a5c9cc 100644 (file)
--- a/jjb/bgpcep/bgpcep-csit-throughpcep.yaml
+++ b/jjb/bgpcep/bgpcep-csit-throughpcep.yaml
@@ -2,7 +2,7 @@
 - project:
     name: bgpcep-csit-throughpcep
     jobs:
-      - inttest-csit-1node-periodic
+      - inttest-csit-1node
       # FIXME: Rename job to drop -periodic- and unify job definition with -gate- functionality.
 
     # The project name

diff --git a/jjb/controller/controller-csit-periodic-dsbenchmark-cluster.yaml b/jjb/controller/controller-csit-dsbenchmark-cluster.yaml
similarity index 99%
rename from jjb/controller/controller-csit-periodic-dsbenchmark-cluster.yaml
rename to jjb/controller/controller-csit-dsbenchmark-cluster.yaml
index 43a9f55b8a397f5076c93ac8fa35bd7f97c40447..2e1f2a9433d4fd0dc81c4721ce8c1cdb0a874428 100644 (file)
--- a/jjb/controller/controller-csit-periodic-dsbenchmark-cluster.yaml
+++ b/jjb/controller/controller-csit-dsbenchmark-cluster.yaml
@@ -1,8 +1,8 @@
 ---
 - project:
-    name: mdsal-csit-periodic-dsbenchmark-cluster
+    name: mdsal-csit-dsbenchmark-cluster
     jobs:
-      - inttest-csit-3node-periodic
+      - inttest-csit-3node
 
     # The project name
     project: 'controller'

diff --git a/jjb/controller/controller-csit-periodic-dsbenchmark.yaml b/jjb/controller/controller-csit-dsbenchmark.yaml
similarity index 99%
rename from jjb/controller/controller-csit-periodic-dsbenchmark.yaml
rename to jjb/controller/controller-csit-dsbenchmark.yaml
index 25f583679cdc0e883ed087f63a0e9e030a3767fc..f9a359f2e5e2af3057c362e1518f0df0304017e3 100644 (file)
--- a/jjb/controller/controller-csit-periodic-dsbenchmark.yaml
+++ b/jjb/controller/controller-csit-dsbenchmark.yaml
@@ -1,8 +1,8 @@
 ---
 - project:
-    name: mdsal-csit-periodic-dsbenchmark
+    name: mdsal-csit-dsbenchmark
     jobs:
-      - inttest-csit-1node-periodic
+      - inttest-csit-1node
 
     # The project name
     project: 'controller'

diff --git a/jjb/integration/integration-templates.yaml b/jjb/integration/integration-templates.yaml
index 92db8923445cc26cecf5aea6447143979634ad84..fa0db5bfc99eeefe5db684babc34d59409f2de5f 100644 (file)
--- a/jjb/integration/integration-templates.yaml
+++ b/jjb/integration/integration-templates.yaml
@@ -3,10 +3,8 @@
 # FIXME: Update
 #
 # {project}-csit-1node-{functionality}-{install}-{stream}
-# {project}-csit-1node-periodic-{functionality}-{install}-{stream}
 # {project}-csit-3node-docker-{functionality}-{install}-{stream}
 # {project}-csit-3node-{functionality}-{install}-{stream}
-# {project}-csit-3node-periodic-{functionality}-{install}-{stream}
 # {project}-csit-hwvtep-{topology}-openstack-{openstack}-{functionality}-{stream}
 # {project}-csit-{topology}-openstack-{openstack}-{functionality}-{stream}
 # {project}-csit-verify-1node-{functionality}
@@ -206,124 +204,6 @@
       - integration-deploy-controller-run-test
       - integration-cleanup-tmp
 
-    publishers:
-      - integration-robot:
-          unstable-if: 0.0
-          pass-if: 100.0
-      - email-notification:
-          email-recipients: '{email-recipients}'
-          email-prefix: '[{project}]'
-      - plot:
-          - title: '{01-plot-title}'
-            yaxis: '{01-plot-yaxis}'
-            group: '{01-plot-group}'
-            num-builds: '5400'
-            keep-records: true
-            style: line
-            use-description: false
-            # yamllint disable-line rule:line-length
-            csv-file-name: '{project}-csit-1node-{functionality}-{install}-{stream}-{01-plot-data-file}-history.csv'
-            series:
-              - file: '{01-plot-data-file}'
-                inclusion-flag: 'off'
-                display-table: true
-                format: csv
-          - title: '{02-plot-title}'
-            yaxis: '{02-plot-yaxis}'
-            group: '{02-plot-group}'
-            num-builds: '5400'
-            keep-records: true
-            style: line
-            use-description: false
-            # yamllint disable-line rule:line-length
-            csv-file-name: '{project}-csit-1node-{functionality}-{install}-{stream}-{02-plot-data-file}-history.csv'
-            series:
-              - file: '{02-plot-data-file}'
-                inclusion-flag: 'off'
-                display-table: true
-                format: csv
-      - integration-csit-archive-build
-      - integration-csit-run-postscript
-      - lf-infra-publish
-
-- job-template:
-    name: '{prefix}{project}-csit-1node-periodic-{functionality}-{install}-{stream}'
-    id: inttest-csit-1node-periodic
-    disabled: false
-
-    project-type: freestyle
-    node: centos7-robot-2c-8g
-
-    properties:
-      - opendaylight-infra-properties:
-          build-days-to-keep: '{build-days-to-keep}'
-
-    parameters:
-      - opendaylight-infra-parameters:
-          os-cloud: '{os-cloud}'
-          project: 'integration/test'
-          branch: '{branch}'
-          refspec: 'refs/heads/{branch}'
-          artifacts: '{archive-artifacts}'
-      - integration-distribution-branch:
-          branch: '{branch}'
-      - integration-distribution-stream:
-          stream: '{stream}'
-      - integration-bundle-url:
-          bundle-url: '{bundle-url}'
-      - integration-repo-url:
-          repo-url: '{repo-url}'
-      - integration-controller-scope:
-          controller-scope: '{scope}'
-      - integration-controller-features:
-          controller-features: '{install-features}'
-      - integration-test-options:
-          test-options: '{robot-options}'
-      - integration-stream-test-plan:
-          stream-test-plan: '{project}-{functionality}-{stream}.txt'
-      - integration-test-plan:
-          test-plan: '{project}-{functionality}.txt'
-      - integration-test-suites:
-          test-suites: '{test-suites}'
-      - integration-patch-refspec:
-          branch: 'master'
-      - integration-jdk-version:
-          jdkversion: '{jre}'
-      - distribution-karaf-version:
-          karaf-version: '{karaf-version}'
-      - integration-use-features-boot:
-          use-features-boot: 'True'
-
-    scm:
-      - integration-gerrit-scm:
-          basedir: 'test'
-          refspec: '$PATCHREFSPEC'
-          branch: 'master'
-
-    wrappers:
-      - opendaylight-infra-wrappers:
-          build-timeout: '{build-timeout}'
-
-    builders:
-      - integration-infra-stack:
-          stack-template: '{stack-template}'
-          vm_0_count: '1'
-          vm_0_flavor: '{odl_system_flavor}'
-          vm_0_image: '{odl_system_image}'
-          vm_1_count: '{tools_system_count}'
-          vm_1_flavor: '{tools_system_flavor}'
-          vm_1_image: '{tools_system_image}'
-      - integration-install-robotframework
-      - inject:
-          properties-file: 'env.properties'
-      - integration-get-slave-addresses
-      - inject:
-          properties-file: 'slave_addresses.txt'
-      - integration-detect-variables
-      - integration-install-common-functions
-      - integration-deploy-controller-run-test
-      - integration-cleanup-tmp
-
     publishers:
       - integration-robot:
           unstable-if: 0.0
@@ -340,7 +220,7 @@
             style: line
             use-description: false
             # yamllint disable-line rule:line-length
-            csv-file-name: '{project}-csit-periodic-1node-{functionality}-{install}-{stream}-{01-plot-data-file}-history.csv'
+            csv-file-name: '{project}-csit-1node-{functionality}-{install}-{stream}-{01-plot-data-file}-history.csv'
             series:
               - file: '{01-plot-data-file}'
                 inclusion-flag: 'off'
@@ -354,7 +234,7 @@
             style: line
             use-description: false
             # yamllint disable-line rule:line-length
-            csv-file-name: '{project}-csit-periodic-1node-{functionality}-{install}-{stream}-{02-plot-data-file}-history.csv'
+            csv-file-name: '{project}-csit-1node-{functionality}-{install}-{stream}-{02-plot-data-file}-history.csv'
             series:
               - file: '{02-plot-data-file}'
                 inclusion-flag: 'off'
@@ -368,7 +248,7 @@
             style: line
             use-description: false
             # yamllint disable-line rule:line-length
-            csv-file-name: '{project}-csit-1node-periodic-{functionality}-{install}-{stream}-{03-plot-data-file}-03-history.csv'
+            csv-file-name: '{project}-csit-1node-{functionality}-{install}-{stream}-{03-plot-data-file}-03-history.csv'
             series:
               - file: '{03-plot-data-file}'
                 inclusion-flag: '{03-inclusion-flag}'
@@ -382,7 +262,7 @@
             style: line
             use-description: false
             # yamllint disable-line rule:line-length
-            csv-file-name: '{project}-csit-1node-periodic-{functionality}-{install}-{stream}-{04-plot-data-file}-04-history.csv'
+            csv-file-name: '{project}-csit-1node-{functionality}-{install}-{stream}-{04-plot-data-file}-04-history.csv'
             series:
               - file: '{04-plot-data-file}'
                 inclusion-flag: '{04-inclusion-flag}'
@@ -396,7 +276,7 @@
             style: line
             use-description: false
             # yamllint disable-line rule:line-length
-            csv-file-name: '{project}-csit-1node-periodic-{functionality}-{install}-{stream}-{05-plot-data-file}-05-history.csv'
+            csv-file-name: '{project}-csit-1node-{functionality}-{install}-{stream}-{05-plot-data-file}-05-history.csv'
             series:
               - file: '{05-plot-data-file}'
                 inclusion-flag: '{05-inclusion-flag}'
@@ -410,7 +290,7 @@
             style: line
             use-description: false
             # yamllint disable-line rule:line-length
-            csv-file-name: '{project}-csit-1node-periodic-{functionality}-{install}-{stream}-{06-plot-data-file}-06-history.csv'
+            csv-file-name: '{project}-csit-1node-{functionality}-{install}-{stream}-{06-plot-data-file}-06-history.csv'
             series:
               - file: '{06-plot-data-file}'
                 inclusion-flag: '{06-inclusion-flag}'
@@ -424,7 +304,7 @@
             style: line
             use-description: false
             # yamllint disable-line rule:line-length
-            csv-file-name: '{project}-csit-1node-periodic-{functionality}-{install}-{stream}-{07-plot-data-file}-07-history.csv'
+            csv-file-name: '{project}-csit-1node-{functionality}-{install}-{stream}-{07-plot-data-file}-07-history.csv'
             series:
               - file: '{07-plot-data-file}'
                 inclusion-flag: '{07-inclusion-flag}'
@@ -438,7 +318,7 @@
             style: line
             use-description: false
             # yamllint disable-line rule:line-length
-            csv-file-name: '{project}-csit-1node-periodic-{functionality}-{install}-{stream}-{08-plot-data-file}-08-history.csv'
+            csv-file-name: '{project}-csit-1node-{functionality}-{install}-{stream}-{08-plot-data-file}-08-history.csv'
             series:
               - file: '{08-plot-data-file}'
                 inclusion-flag: '{08-inclusion-flag}'
@@ -452,7 +332,7 @@
             style: line
             use-description: false
             # yamllint disable-line rule:line-length
-            csv-file-name: '{project}-csit-1node-periodic-{functionality}-{install}-{stream}-{09-plot-data-file}-09-history.csv'
+            csv-file-name: '{project}-csit-1node-{functionality}-{install}-{stream}-{09-plot-data-file}-09-history.csv'
             series:
               - file: '{09-plot-data-file}'
                 inclusion-flag: '{09-inclusion-flag}'
@@ -466,7 +346,7 @@
             style: line
             use-description: false
             # yamllint disable-line rule:line-length
-            csv-file-name: '{project}-csit-1node-periodic-{functionality}-{install}-{stream}-{10-plot-data-file}-10-history.csv'
+            csv-file-name: '{project}-csit-1node-{functionality}-{install}-{stream}-{10-plot-data-file}-10-history.csv'
             series:
               - file: '{10-plot-data-file}'
                 inclusion-flag: '{10-inclusion-flag}'
@@ -661,10 +541,11 @@
           - 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
+            # yamllint disable-line rule:line-length
             csv-file-name: '{project}-csit-3node-{functionality}-{install}-{stream}-{01-plot-data-file}-history.csv'
             series:
               - file: '{01-plot-data-file}'
@@ -674,140 +555,136 @@
           - 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
+            # yamllint disable-line rule:line-length
             csv-file-name: '{project}-csit-3node-{functionality}-{install}-{stream}-{02-plot-data-file}-history.csv'
             series:
               - file: '{02-plot-data-file}'
                 inclusion-flag: 'off'
                 display-table: true
                 format: csv
-      - integration-csit-archive-build
-      - integration-csit-run-postscript
-      - lf-infra-publish
-
-- job-template:
-    name: '{prefix}{project}-csit-3node-docker-{functionality}-{install}-{stream}'
-    id: inttest-csit-3node-docker
-    disabled: false
-
-    project-type: freestyle
-    node: centos7-robot-2c-8g
-
-    properties:
-      - opendaylight-infra-properties:
-          build-days-to-keep: '{build-days-to-keep}'
-
-    parameters:
-      - opendaylight-infra-parameters:
-          os-cloud: '{os-cloud}'
-          project: 'integration/test'
-          branch: '{branch}'
-          refspec: 'refs/heads/{branch}'
-          artifacts: '{archive-artifacts}'
-      - integration-distribution-branch:
-          branch: '{branch}'
-      - integration-distribution-stream:
-          stream: '{stream}'
-      - integration-bundle-url:
-          bundle-url: '{bundle-url}'
-      - integration-repo-url:
-          repo-url: '{repo-url}'
-      - integration-controller-scope:
-          controller-scope: '{scope}'
-      - integration-controller-features:
-          controller-features: 'odl-jolokia,{install-features}'
-      - integration-test-options:
-          test-options: '{robot-options}'
-      - integration-stream-test-plan:
-          stream-test-plan: '{project}-{functionality}-{stream}.txt'
-      - integration-test-plan:
-          test-plan: '{project}-{functionality}.txt'
-      - integration-patch-refspec:
-          branch: 'master'
-      - integration-jdk-version:
-          jdkversion: '{jre}'
-      - distribution-karaf-version:
-          karaf-version: '{karaf-version}'
-      - integration-use-features-boot:
-          use-features-boot: 'True'
-
-    scm:
-      - integration-gerrit-scm:
-          basedir: 'test'
-          refspec: '$PATCHREFSPEC'
-          branch: 'master'
-
-    wrappers:
-      - opendaylight-infra-wrappers:
-          build-timeout: '{build-timeout}'
-
-    builders:
-      - integration-infra-stack:
-          stack-template: '{stack-template}'
-          vm_0_count: '3'
-          vm_0_flavor: '{odl_system_flavor}'
-          vm_0_image: '{odl_system_image}'
-          vm_1_count: '{docker_system_count}'
-          vm_1_flavor: '{docker_system_flavor}'
-          vm_1_image: '{docker_system_image}'
-      - integration-install-robotframework
-      - inject:
-          properties-file: 'env.properties'
-      - integration-get-slave-addresses
-      - inject:
-          properties-file: 'slave_addresses.txt'
-      - integration-detect-variables
-      - integration-install-common-functions
-      - integration-configure-clustering
-      - integration-start-cluster-run-test
-      - integration-cleanup-tmp
-
-    publishers:
-      - integration-robot:
-          unstable-if: 0.0
-          pass-if: 100.0
-      - email-notification:
-          email-recipients: '{email-recipients}'
-          email-prefix: '[{project}]'
-      - plot:
-          - title: '{01-plot-title}'
-            yaxis: '{01-plot-yaxis}'
-            group: '{01-plot-group}'
-            num-builds: '5400'
+          - title: '{03-plot-title}'
+            yaxis: '{03-plot-yaxis}'
+            group: '{03-plot-group}'
+            num-builds: '180'
             keep-records: true
             style: line
             use-description: false
             # yamllint disable-line rule:line-length
-            csv-file-name: '{project}-csit-3node-{functionality}-{install}-{stream}-{01-plot-data-file}-history.csv'
+            csv-file-name: '{project}-csit-3node-{functionality}-{install}-{stream}-{03-plot-data-file}-03-history.csv'
             series:
-              - file: '{01-plot-data-file}'
-                inclusion-flag: 'off'
-                display-table: true
+              - file: '{03-plot-data-file}'
+                inclusion-flag: '{03-inclusion-flag}'
+                exclude: '{03-exclude-value}'
                 format: csv
-          - title: '{02-plot-title}'
-            yaxis: '{02-plot-yaxis}'
-            group: '{02-plot-group}'
-            num-builds: '5400'
+          - title: '{04-plot-title}'
+            yaxis: '{04-plot-yaxis}'
+            group: '{04-plot-group}'
+            num-builds: '180'
             keep-records: true
             style: line
             use-description: false
             # yamllint disable-line rule:line-length
-            csv-file-name: '{project}-csit-3node-{functionality}-{install}-{stream}-{02-plot-data-file}-history.csv'
+            csv-file-name: '{project}-csit-3node-{functionality}-{install}-{stream}-{04-plot-data-file}-04-history.csv'
             series:
-              - file: '{02-plot-data-file}'
-                inclusion-flag: 'off'
-                display-table: true
+              - 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
+            # yamllint disable-line rule:line-length
+            csv-file-name: '{project}-csit-3node-{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
+            # yamllint disable-line rule:line-length
+            csv-file-name: '{project}-csit-3node-{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
+            # yamllint disable-line rule:line-length
+            csv-file-name: '{project}-csit-3node-{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
+            # yamllint disable-line rule:line-length
+            csv-file-name: '{project}-csit-3node-{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
+            # yamllint disable-line rule:line-length
+            csv-file-name: '{project}-csit-3node-{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
+            # yamllint disable-line rule:line-length
+            csv-file-name: '{project}-csit-3node-{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
       - integration-csit-run-postscript
       - lf-infra-publish
 
 - job-template:
-    name: '{prefix}{project}-csit-3node-periodic-{functionality}-{install}-{stream}'
-    id: inttest-csit-3node-periodic
+    name: '{prefix}{project}-csit-3node-docker-{functionality}-{install}-{stream}'
+    id: inttest-csit-3node-docker
     disabled: false
 
     project-type: freestyle
@@ -842,8 +719,6 @@
           stream-test-plan: '{project}-{functionality}-{stream}.txt'
       - integration-test-plan:
           test-plan: '{project}-{functionality}.txt'
-      - integration-test-suites:
-          test-suites: '{test-suites}'
       - integration-patch-refspec:
           branch: 'master'
       - integration-jdk-version:
@@ -869,9 +744,9 @@
           vm_0_count: '3'
           vm_0_flavor: '{odl_system_flavor}'
           vm_0_image: '{odl_system_image}'
-          vm_1_count: '{tools_system_count}'
-          vm_1_flavor: '{tools_system_flavor}'
-          vm_1_image: '{tools_system_image}'
+          vm_1_count: '{docker_system_count}'
+          vm_1_flavor: '{docker_system_flavor}'
+          vm_1_image: '{docker_system_image}'
       - integration-install-robotframework
       - inject:
           properties-file: 'env.properties'
@@ -895,12 +770,12 @@
           - title: '{01-plot-title}'
             yaxis: '{01-plot-yaxis}'
             group: '{01-plot-group}'
-            num-builds: '180'
+            num-builds: '5400'
             keep-records: true
             style: line
             use-description: false
             # yamllint disable-line rule:line-length
-            csv-file-name: '{project}-csit-3node-periodic-{functionality}-{install}-{stream}-{01-plot-data-file}-history.csv'
+            csv-file-name: '{project}-csit-3node-{functionality}-{install}-{stream}-{01-plot-data-file}-history.csv'
             series:
               - file: '{01-plot-data-file}'
                 inclusion-flag: 'off'
@@ -909,129 +784,17 @@
           - title: '{02-plot-title}'
             yaxis: '{02-plot-yaxis}'
             group: '{02-plot-group}'
-            num-builds: '180'
+            num-builds: '5400'
             keep-records: true
             style: line
             use-description: false
             # yamllint disable-line rule:line-length
-            csv-file-name: '{project}-csit-3node-periodic-{functionality}-{install}-{stream}-{02-plot-data-file}-history.csv'
+            csv-file-name: '{project}-csit-3node-{functionality}-{install}-{stream}-{02-plot-data-file}-history.csv'
             series:
               - file: '{02-plot-data-file}'
                 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
-            # yamllint disable-line rule:line-length
-            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
-            # yamllint disable-line rule:line-length
-            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
-            # yamllint disable-line rule:line-length
-            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
-            # yamllint disable-line rule:line-length
-            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
-            # yamllint disable-line rule:line-length
-            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
-            # yamllint disable-line rule:line-length
-            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
-            # yamllint disable-line rule:line-length
-            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
-            # yamllint disable-line rule:line-length
-            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
       - integration-csit-run-postscript
       - lf-infra-publish

diff --git a/jjb/l2switch/l2switch-csit-host-scalability-daily.yaml b/jjb/l2switch/l2switch-csit-host-scalability-daily.yaml
index fc55dafa03dd7970051343b35823680e79efbafd..63be624c0097db7ffe7e0a597fa62b8345630ef2 100644 (file)
--- a/jjb/l2switch/l2switch-csit-host-scalability-daily.yaml
+++ b/jjb/l2switch/l2switch-csit-host-scalability-daily.yaml
@@ -2,7 +2,7 @@
 - project:
     name: l2switch-csit-host-scalability-daily
     jobs:
-      - inttest-csit-1node-periodic
+      - inttest-csit-1node
 
     # The project name
     project: 'l2switch'

diff --git a/jjb/l2switch/l2switch-patch-test.yaml b/jjb/l2switch/l2switch-patch-test.yaml
index 472071b54339143d7492abb7aa7f078135a9f3b4..fd3e64984569a54c09f736cfcdc2fce44c8f9c7f 100644 (file)
--- a/jjb/l2switch/l2switch-patch-test.yaml
+++ b/jjb/l2switch/l2switch-patch-test.yaml
@@ -22,6 +22,6 @@
     feature:
       - all:
           csit-list: >
-              l2switch-csit-1node-periodic-host-scalability-daily-only-{stream},
+              l2switch-csit-1node--host-scalability-daily-only-{stream},
               l2switch-csit-1node-scalability-all-{stream},
               l2switch-csit-1node-switch-all-{stream}

diff --git a/jjb/mdsal/mdsal-csit-bindingv1.yaml b/jjb/mdsal/mdsal-csit-bindingv1.yaml
index 6e6075725bc66d2f70435c4a46ee9ffd77b30e3b..b0b9524470ad70a95d51e541aafecce8318f5f5c 100644 (file)
--- a/jjb/mdsal/mdsal-csit-bindingv1.yaml
+++ b/jjb/mdsal/mdsal-csit-bindingv1.yaml
@@ -2,7 +2,7 @@
 - project:
     name: mdsal-csit-bindingv1
     jobs:
-      - inttest-csit-1node-periodic
+      - inttest-csit-1node
 
     # The project name
     project: 'mdsal'

diff --git a/jjb/netconf/netconf-clustering-scale.yaml b/jjb/netconf/netconf-clustering-scale.yaml
index 46ad660fc362e6890dfddee8cec4d654d7e90e38..9b992e5760cdd4e3ac0353364ab82d619916336d 100644 (file)
--- a/jjb/netconf/netconf-clustering-scale.yaml
+++ b/jjb/netconf/netconf-clustering-scale.yaml
@@ -2,7 +2,7 @@
 - project:
     name: netconf-csit-clustering-scale
     jobs:
-      - inttest-csit-3node-periodic
+      - inttest-csit-3node
 
     # The project name
     project: 'netconf'

diff --git a/jjb/netconf/netconf-scale.yaml b/jjb/netconf/netconf-scale.yaml
index 0b5bc974e7987e789f4f50c49fe41ec36a12e846..e081c45d26910bb0eeb5976b0a3a47d71a156d43 100644 (file)
--- a/jjb/netconf/netconf-scale.yaml
+++ b/jjb/netconf/netconf-scale.yaml
@@ -2,7 +2,7 @@
 - project:
     name: netconf-csit-scale
     jobs:
-      - inttest-csit-1node-periodic
+      - inttest-csit-1node
 
     # The project name
     project: 'netconf'

diff --git a/jjb/sxp/sxp-csit-cluster-routing.yaml b/jjb/sxp/sxp-csit-cluster-routing.yaml
index 3f73956b42fc5caace02170f6156bfe241673881..d7b95d23c39cda248e2cde1e89081e4975e27402 100644 (file)
--- a/jjb/sxp/sxp-csit-cluster-routing.yaml
+++ b/jjb/sxp/sxp-csit-cluster-routing.yaml
@@ -2,7 +2,7 @@
 - project:
     name: sxp-csit-routing
     jobs:
-      - inttest-csit-3node-periodic
+      - inttest-csit-3node
 
     # The project name
     project: 'sxp'

diff --git a/jjb/sxp/sxp-csit-clustering.yaml b/jjb/sxp/sxp-csit-clustering.yaml
index 4ffc77f52c411e6d81401c80a0aaaae853a71414..7404e0b81caf58695110b1951cca966efcebf83c 100644 (file)
--- a/jjb/sxp/sxp-csit-clustering.yaml
+++ b/jjb/sxp/sxp-csit-clustering.yaml
@@ -2,7 +2,7 @@
 - project:
     name: sxp-csit-clustering
     jobs:
-      - inttest-csit-3node-periodic
+      - inttest-csit-3node
 
     # The project name
     project: 'sxp'

diff --git a/jjb/sxp/sxp-csit-performance.yaml b/jjb/sxp/sxp-csit-performance.yaml
index 19599a919c877dcc2c59cc30aa9183b27fd2fa28..954ab23cab2878565f51116168a1f34d1ec141ab 100644 (file)
--- a/jjb/sxp/sxp-csit-performance.yaml
+++ b/jjb/sxp/sxp-csit-performance.yaml
@@ -2,7 +2,7 @@
 - project:
     name: sxp-csit-performance
     jobs:
-      - inttest-csit-1node-periodic
+      - inttest-csit-1node
 
     # The project name
     project: 'sxp'

diff --git a/jjb/yangtools/yangtools-csit-system.yaml b/jjb/yangtools/yangtools-csit-system.yaml
index f27bc5f50ddab57e60023648e13f6d8e5060da16..52320ec7e4ffae063cddd3b5bfc657a97b4123c6 100644 (file)
--- a/jjb/yangtools/yangtools-csit-system.yaml
+++ b/jjb/yangtools/yangtools-csit-system.yaml
@@ -2,7 +2,7 @@
 - project:
     name: yangtools-csit-system
     jobs:
-      - inttest-csit-1node-periodic
+      - inttest-csit-1node
 
     # The project name
     project: 'yangtools'