X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fintegration%2Fintegration-templates.yaml;h=633782d2784784d6d477b02b82069fa07379b3c7;hb=5a6d2571c0f1f6efeffbb6fdf5ff6e74f6ad46de;hp=741c47c35b09cc9f4e5552a160e7005ff4cc8ce4;hpb=d5474af4789ce3a967337d5c443da27e55b045f5;p=releng%2Fbuilder.git

diff --git a/jjb/integration/integration-templates.yaml b/jjb/integration/integration-templates.yaml
index 741c47c35..633782d27 100644
--- 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}
@@ -32,7 +30,8 @@
 # New templates
 
 - job-template:
-    name: '{project}-csit-verify-1node-{functionality}'
+    name: '{prefix}{project}-csit-verify-1node-{functionality}'
+    id: inttest-csit-verify-1node
     disabled: false
 
     project-type: freestyle
@@ -55,6 +54,8 @@
           stream: '{verify-stream}'
       - integration-bundle-url:
           bundle-url: '{bundle-url}'
+      - integration-repo-url:
+          repo-url: '{repo-url}'
       - integration-controller-scope:
           controller-scope: 'only'
       - integration-controller-features:
@@ -104,6 +105,7 @@
       - inject:
           properties-file: 'slave_addresses.txt'
       - integration-detect-variables
+      - integration-install-common-functions
       - integration-deploy-controller-run-test
       - integration-cleanup-tmp
 
@@ -116,11 +118,12 @@
           email-prefix: '[{project}]'
       - integration-csit-archive-build
       - integration-csit-run-postscript
+      - releng-openstack-stack-delete
       - lf-infra-publish
 
 - job-template:
-    name: '{project}-csit-1node-{functionality}-{install}-{stream}'
-    # Keep synchronized with *-csit4-*-carbon please.
+    name: '{prefix}{project}-csit-1node-{functionality}-{install}-{stream}'
+    id: inttest-csit-1node
     disabled: false
 
     project-type: freestyle
@@ -143,16 +146,22 @@
           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-controller-debug-map:
+          controller-debug-map: '{debug-map}'
       - 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:
@@ -193,118 +202,7 @@
       - inject:
           properties-file: 'slave_addresses.txt'
       - integration-detect-variables
-      - 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: '{project}-csit-1node-periodic-{functionality}-{install}-{stream}'
-    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-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-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
 
@@ -324,7 +222,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'
@@ -338,7 +236,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'
@@ -352,7 +250,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}'
@@ -366,7 +264,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}'
@@ -380,7 +278,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}'
@@ -394,7 +292,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}'
@@ -408,7 +306,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}'
@@ -422,7 +320,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}'
@@ -436,7 +334,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}'
@@ -450,7 +348,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}'
@@ -458,10 +356,12 @@
                 format: csv
       - integration-csit-archive-build
       - integration-csit-run-postscript
+      - releng-openstack-stack-delete
       - lf-infra-publish
 
 - job-template:
-    name: '{project}-csit-verify-3node-{functionality}'
+    name: '{prefix}{project}-csit-verify-3node-{functionality}'
+    id: inttest-csit-verify-3node
     disabled: false
 
     project-type: freestyle
@@ -484,6 +384,8 @@
           stream: '{verify-stream}'
       - integration-bundle-url:
           bundle-url: '{bundle-url}'
+      - integration-repo-url:
+          repo-url: '{repo-url}'
       - integration-controller-scope:
           controller-scope: 'only'
       - integration-controller-features:
@@ -494,6 +396,8 @@
           stream-test-plan: '{project}-{functionality}-{verify-stream}.txt'
       - integration-test-plan:
           test-plan: '{project}-{functionality}.txt'
+      - integration-test-suites:
+          test-suites: '{test-suites}'
       - integration-jdk-version:
           jdkversion: '{verify-jdkversion}'
       - distribution-karaf-version:
@@ -534,6 +438,7 @@
       - inject:
           properties-file: 'slave_addresses.txt'
       - integration-detect-variables
+      - integration-install-common-functions
       - integration-configure-clustering
       - integration-start-cluster-run-test
       - integration-cleanup-tmp
@@ -547,10 +452,12 @@
           email-prefix: '[{project}]'
       - integration-csit-archive-build
       - integration-csit-run-postscript
+      - releng-openstack-stack-delete
       - lf-infra-publish
 
 - job-template:
-    name: '{project}-csit-3node-{functionality}-{install}-{stream}'
+    name: '{prefix}{project}-csit-3node-{functionality}-{install}-{stream}'
+    id: inttest-csit-3node
     disabled: false
 
     project-type: freestyle
@@ -573,16 +480,22 @@
           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-controller-debug-map:
+          controller-debug-map: '{debug-map}'
       - 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:
@@ -618,6 +531,7 @@
       - inject:
           properties-file: 'slave_addresses.txt'
       - integration-detect-variables
+      - integration-install-common-functions
       - integration-configure-clustering
       - integration-start-cluster-run-test
       - integration-cleanup-tmp
@@ -633,10 +547,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}'
@@ -646,135 +561,137 @@
           - 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: '{project}-csit-3node-docker-{functionality}-{install}-{stream}'
-    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-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-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
+      - releng-openstack-stack-delete
       - lf-infra-publish
 
 - job-template:
-    name: '{project}-csit-3node-periodic-{functionality}-{install}-{stream}'
+    name: '{prefix}{project}-csit-3node-docker-{functionality}-{install}-{stream}'
+    id: inttest-csit-3node-docker
     disabled: false
 
     project-type: freestyle
@@ -797,6 +714,8 @@
           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:
@@ -832,9 +751,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'
@@ -842,6 +761,7 @@
       - inject:
           properties-file: 'slave_addresses.txt'
       - integration-detect-variables
+      - integration-install-common-functions
       - integration-configure-clustering
       - integration-start-cluster-run-test
       - integration-cleanup-tmp
@@ -857,12 +777,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'
@@ -871,135 +791,25 @@
           - 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
+      - releng-openstack-stack-delete
       - lf-infra-publish
 
 - job-template:
-    name: '{project}-csit-hwvtep-{topology}-openstack-{openstack}-{functionality}-{stream}'
+    name: '{prefix}{project}-csit-hwvtep-{topology}-openstack-{openstack}-{functionality}-{stream}'
+    id: inttest-csit-hwvtep-openstack
     disabled: false
 
     project-type: freestyle
@@ -1023,6 +833,8 @@
           stream: '{stream}'
       - integration-bundle-url:
           bundle-url: '{bundle-url}'
+      - integration-repo-url:
+          repo-url: '{repo-url}'
       - integration-controller-features:
           controller-features: '{install-features}'
       - integration-controller-debug-map:
@@ -1102,6 +914,10 @@
           name: ENABLE_OS_COMPUTE_SERVICES
           default: '{enable-openstack-compute-services}'
           description: 'comma separated list of services to enable on compute nodes'
+      - string:
+          name: ENABLE_OS_NETWORK_SERVICES
+          default: '{enable-openstack-network-services}'
+          description: 'comma seperated list of network services to enable'
       - string:
           name: ENABLE_OS_PLUGINS
           default: '{enable-openstack-plugins}'
@@ -1182,6 +998,7 @@
       - inject:
           properties-file: 'slave_addresses.txt'
       - integration-detect-variables
+      - integration-install-common-functions
       - integration-deploy-controller-run-test
       - integration-deploy-openstack-run-test
       - integration-cleanup-tmp
@@ -1193,12 +1010,15 @@
       - email-notification:
           email-recipients: '{email-recipients}'
           email-prefix: '[{project}]'
+      - integration-csit-collect-netvirt-logs
       - integration-csit-archive-build
       - integration-csit-run-postscript
+      - releng-openstack-stack-delete
       - lf-infra-publish
 
 - job-template:
-    name: '{project}-csit-{topology}-openstack-{openstack}-{functionality}-{stream}'
+    name: '{prefix}{project}-csit-{topology}-openstack-{openstack}-{functionality}-{stream}'
+    id: inttest-csit-openstack
     disabled: false
 
     project-type: freestyle
@@ -1222,6 +1042,8 @@
           stream: '{stream}'
       - integration-bundle-url:
           bundle-url: '{bundle-url}'
+      - integration-repo-url:
+          repo-url: '{repo-url}'
       - integration-controller-features:
           controller-features: '{install-features}'
       - integration-controller-debug-map:
@@ -1301,6 +1123,10 @@
           name: ENABLE_OS_COMPUTE_SERVICES
           default: '{enable-openstack-compute-services}'
           description: 'comma separated list of services to enable on compute nodes'
+      - string:
+          name: ENABLE_OS_NETWORK_SERVICES
+          default: '{enable-openstack-network-services}'
+          description: 'comma seperated list of network services to enable'
       - string:
           name: ENABLE_OS_PLUGINS
           default: '{enable-openstack-plugins}'
@@ -1383,6 +1209,7 @@
       - inject:
           properties-file: 'slave_addresses.txt'
       - integration-detect-variables
+      - integration-install-common-functions
       - integration-deploy-controller-run-test
       - integration-deploy-openstack-run-test
       - integration-cleanup-tmp
@@ -1394,8 +1221,10 @@
       - email-notification:
           email-recipients: '{email-recipients}'
           email-prefix: '[{project}]'
+      - integration-csit-collect-netvirt-logs
       - integration-csit-archive-build
       - integration-csit-run-postscript
+      - releng-openstack-stack-delete
       - lf-infra-publish
 
 # Template: {project}-patch-test-{stream}
@@ -1404,12 +1233,13 @@
 # triggers the project system test defined in {csit-list} when gerrit receives test-{project} keyword
 
 - job-template:
-    name: '{project}-patch-test-{feature}-{stream}'
+    name: '{prefix}{project}-patch-test-{feature}-{stream}'
+    id: inttest-patch-test
 
     project-type: freestyle
-    node: centos7-java-builder-2c-8g
+    node: centos7-builder-2c-8g
     concurrent: true
-    jdk: '{jdk}'
+    jdk: '{java-version}'
 
     properties:
       - opendaylight-infra-properties:
@@ -1433,7 +1263,7 @@
           default: 'all'
           description: 'Specific feature test for patch'
       - maven-exec:
-          maven-version: mvn33
+          maven-version: mvn35
 
     scm:
       - integration-gerrit-scm:
@@ -1471,16 +1301,17 @@
       - integration-rebase-gerrit-patch
       - wipe-org-opendaylight-repo
       - maven-target:
-          maven-version: mvn33
+          maven-version: mvn35
           pom: '{project}/pom.xml'
           goals: |
               clean install dependency:tree
               -Pq
               -Dgitid.skip=false
+              -Dmaven.gitcommitid.skip=false
               -DgenerateReports=false
               -Dstream={stream}
               {opendaylight-infra-mvn-opts}
-          # TODO: {opendaylight-infra-parallel-mvn-opts}?
+          # {opendaylight-infra-parallel-mvn-opts} is bad when there are multiple big features in SFT.
           java-opts:
             - '-Xmx4096m -XX:MaxPermSize=1024m -Dmaven.compile.fork=true'
           settings: integration-settings
@@ -1488,13 +1319,15 @@
           global-settings: global-settings
           global-settings-type: cfp
       - maven-target:
-          maven-version: mvn33
+          maven-version: mvn35
           pom: distribution/pom.xml
           goals: |
               clean install dependency:tree
               -Pq
               -Dgitid.skip=false
-              {opendaylight-infra-parallel-mvn-opts}
+              -Dmaven.gitcommitid.skip=false
+              {opendaylight-infra-mvn-opts}
+          # {opendaylight-infra-parallel-mvn-opts} is bad when there are multiple big features in SFT.
           java-opts:
             - '-Xmx1024m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
           settings: integration-settings