X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fintegration%2Fintegration-templates.yaml;h=b71eea9d5514b5e34a8d7c887c5819717d26fa86;hb=a9e6d23e97e172ce6844bca1196d72bb574caa89;hp=8cb3235a0145cbcbe4e0829c1f830524222bf359;hpb=dda3174f7cc487b4c2e41582c74db9556226c452;p=releng%2Fbuilder.git

diff --git a/jjb/integration/integration-templates.yaml b/jjb/integration/integration-templates.yaml
index 8cb3235a0..9399df8c0 100644
--- a/jjb/integration/integration-templates.yaml
+++ b/jjb/integration/integration-templates.yaml
@@ -2,12 +2,16 @@
 # Job templates in this file (please update with every new template):
 # FIXME: Update
 #
-# {project}-csit-verify-1node-{functionality}
 # {project}-csit-1node-{functionality}-{install}-{stream}
 # {project}-csit-1node-periodic-{functionality}-{install}-{stream}
-# {project}-csit-verify-3node-{functionality}
+# {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}
+# {project}-csit-verify-3node-{functionality}
+# {project}-patch-test-{feature}-{stream}
 #
 # Parameters:
 # FIXME: Distinguish variables, macros and arguments, then update.
@@ -15,23 +19,25 @@
 # opendaylight-infra-parameters: main project integration/test ($PROJECT)
 # jre: (openjdk7 or openjdk8) Java runtime environment to use when launching ODL
 # integration-distribution-branch: distribution branch ($DISTROBRANCH)
-# integration-controller-bundleurl: distribution URL ($BUNDLEURL)
+# integration-controller-bundle-url: distribution URL ($BUNDLE_URL)
 # integration-controller-scope: only or all features ($CONTROLLERSCOPE)
 # integration-controller-features: features under test ($CONTROLLER FEATURES)
 # integration-test-options: robot options ($TESTOPTIONS)
 # integration-stream-test-plan: stream specific robot test plan ($STREAMTESTPLAN)
 # integration-test-plan: fallback robot test plan ($TESTPLAN)
 # integration-patch-refspec: test branch ($PATCHREFSPEC)
+# integration-use-features-boot: bool to toggle use of featuresBoot ($USEFEATURESBOOT)
 
 
 # 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
-    node: centos7-robot-2c-2g
+    node: centos7-robot-2c-8g
 
     properties:
       - opendaylight-infra-properties:
@@ -48,8 +54,8 @@
           branch: '{verify-branch}'
       - integration-distribution-stream:
           stream: '{verify-stream}'
-      - integration-bundleurl:
-          bundleurl: '{bundleurl}'
+      - integration-bundle-url:
+          bundle-url: '{bundle-url}'
       - integration-controller-scope:
           controller-scope: 'only'
       - integration-controller-features:
@@ -62,7 +68,10 @@
           test-plan: '{project}-{functionality}.txt'
       - integration-jdk-version:
           jdkversion: '{verify-jdkversion}'
-
+      - distribution-karaf-version:
+          karaf-version: '{verify-karaf-version}'
+      - integration-use-features-boot:
+          use-features-boot: 'True'
     scm:
       - integration-gerrit-scm:
           basedir: 'test'
@@ -75,7 +84,7 @@
 
     triggers:
       - integration-trigger-patch-submitted:
-          server: '{server-name}'
+          gerrit-server-name: '{gerrit-server-name}'
           project: 'integration/test'
           branch: 'master'
           files: 'csit/suites/{project}/**'
@@ -95,9 +104,7 @@
       - integration-get-slave-addresses
       - inject:
           properties-file: 'slave_addresses.txt'
-      - integration-get-bundle-vars
-      - inject:
-          properties-file: 'bundle_vars.txt'
+      - integration-detect-variables
       - integration-deploy-controller-run-test
       - integration-cleanup-tmp
 
@@ -109,15 +116,17 @@
           email-recipients: '{email-recipients}'
           email-prefix: '[{project}]'
       - integration-csit-archive-build
-      - opendaylight-infra-shiplogs:
-          maven-version: 'mvn33'
+      - integration-csit-run-postscript
+      - lf-infra-publish
 
 - job-template:
-    name: '{project}-csit-1node-{functionality}-{install}-{stream}'
+    name: '{prefix}{project}-csit-1node-{functionality}-{install}-{stream}'
+    id: inttest-csit-1node
+    # Keep synchronized with *-csit4-*-carbon please.
     disabled: false
 
     project-type: freestyle
-    node: centos7-robot-2c-2g
+    node: centos7-robot-2c-8g
 
     properties:
       - opendaylight-infra-properties:
@@ -134,8 +143,8 @@
           branch: '{branch}'
       - integration-distribution-stream:
           stream: '{stream}'
-      - integration-bundleurl:
-          bundleurl: '{bundleurl}'
+      - integration-bundle-url:
+          bundle-url: '{bundle-url}'
       - integration-controller-scope:
           controller-scope: '{scope}'
       - integration-controller-features:
@@ -146,10 +155,16 @@
           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:
@@ -157,6 +172,11 @@
           refspec: '$PATCHREFSPEC'
           branch: 'master'
 
+    triggers:
+      # we need this for not SR projects
+      - integration-csit-trigger:
+          jobs: '{trigger-jobs}'
+
     wrappers:
       - opendaylight-infra-wrappers:
           build-timeout: '{build-timeout}'
@@ -176,9 +196,7 @@
       - integration-get-slave-addresses
       - inject:
           properties-file: 'slave_addresses.txt'
-      - integration-get-bundle-vars
-      - inject:
-          properties-file: 'bundle_vars.txt'
+      - integration-detect-variables
       - integration-deploy-controller-run-test
       - integration-cleanup-tmp
 
@@ -219,15 +237,15 @@
                 display-table: true
                 format: csv
       - integration-csit-archive-build
-      - opendaylight-infra-shiplogs:
-          maven-version: 'mvn33'
+      - 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-2g
+    node: centos7-robot-2c-8g
 
     properties:
       - opendaylight-infra-properties:
@@ -244,8 +262,8 @@
           branch: '{branch}'
       - integration-distribution-stream:
           stream: '{stream}'
-      - integration-bundleurl:
-          bundleurl: '{bundleurl}'
+      - integration-bundle-url:
+          bundle-url: '{bundle-url}'
       - integration-controller-scope:
           controller-scope: '{scope}'
       - integration-controller-features:
@@ -256,10 +274,16 @@
           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:
@@ -286,9 +310,7 @@
       - integration-get-slave-addresses
       - inject:
           properties-file: 'slave_addresses.txt'
-      - integration-get-bundle-vars
-      - inject:
-          properties-file: 'bundle_vars.txt'
+      - integration-detect-variables
       - integration-deploy-controller-run-test
       - integration-cleanup-tmp
 
@@ -441,15 +463,15 @@
                 exclude: '{10-exclude-value}'
                 format: csv
       - integration-csit-archive-build
-      - opendaylight-infra-shiplogs:
-          maven-version: 'mvn33'
+      - integration-csit-run-postscript
+      - lf-infra-publish
 
 - job-template:
     name: '{project}-csit-verify-3node-{functionality}'
     disabled: false
 
     project-type: freestyle
-    node: centos7-robot-2c-2g
+    node: centos7-robot-2c-8g
 
     properties:
       - opendaylight-infra-properties:
@@ -466,8 +488,8 @@
           branch: '{verify-branch}'
       - integration-distribution-stream:
           stream: '{verify-stream}'
-      - integration-bundleurl:
-          bundleurl: '{bundleurl}'
+      - integration-bundle-url:
+          bundle-url: '{bundle-url}'
       - integration-controller-scope:
           controller-scope: 'only'
       - integration-controller-features:
@@ -478,8 +500,14 @@
           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:
+          karaf-version: '{verify-karaf-version}'
+      - integration-use-features-boot:
+          use-features-boot: 'True'
 
     scm:
       - integration-gerrit-scm:
@@ -493,7 +521,7 @@
 
     triggers:
       - integration-trigger-patch-submitted:
-          server: '{server-name}'
+          gerrit-server-name: '{gerrit-server-name}'
           project: 'integration/test'
           branch: 'master'
           files: 'csit/suites/{project}/**'
@@ -513,9 +541,7 @@
       - integration-get-slave-addresses
       - inject:
           properties-file: 'slave_addresses.txt'
-      - integration-get-bundle-vars
-      - inject:
-          properties-file: 'bundle_vars.txt'
+      - integration-detect-variables
       - integration-configure-clustering
       - integration-start-cluster-run-test
       - integration-cleanup-tmp
@@ -528,15 +554,15 @@
           email-recipients: '{email-recipients}'
           email-prefix: '[{project}]'
       - integration-csit-archive-build
-      - opendaylight-infra-shiplogs:
-          maven-version: 'mvn33'
+      - integration-csit-run-postscript
+      - lf-infra-publish
 
 - job-template:
     name: '{project}-csit-3node-{functionality}-{install}-{stream}'
     disabled: false
 
     project-type: freestyle
-    node: centos7-robot-2c-2g
+    node: centos7-robot-2c-8g
 
     properties:
       - opendaylight-infra-properties:
@@ -553,8 +579,8 @@
           branch: '{branch}'
       - integration-distribution-stream:
           stream: '{stream}'
-      - integration-bundleurl:
-          bundleurl: '{bundleurl}'
+      - integration-bundle-url:
+          bundle-url: '{bundle-url}'
       - integration-controller-scope:
           controller-scope: '{scope}'
       - integration-controller-features:
@@ -565,10 +591,16 @@
           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:
@@ -595,9 +627,7 @@
       - integration-get-slave-addresses
       - inject:
           properties-file: 'slave_addresses.txt'
-      - integration-get-bundle-vars
-      - inject:
-          properties-file: 'bundle_vars.txt'
+      - integration-detect-variables
       - integration-configure-clustering
       - integration-start-cluster-run-test
       - integration-cleanup-tmp
@@ -637,15 +667,15 @@
                 display-table: true
                 format: csv
       - integration-csit-archive-build
-      - opendaylight-infra-shiplogs:
-          maven-version: 'mvn33'
+      - 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-2g
+    node: centos7-robot-2c-8g
 
     properties:
       - opendaylight-infra-properties:
@@ -662,8 +692,8 @@
           branch: '{branch}'
       - integration-distribution-stream:
           stream: '{stream}'
-      - integration-bundleurl:
-          bundleurl: '{bundleurl}'
+      - integration-bundle-url:
+          bundle-url: '{bundle-url}'
       - integration-controller-scope:
           controller-scope: '{scope}'
       - integration-controller-features:
@@ -678,6 +708,10 @@
           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:
@@ -704,9 +738,7 @@
       - integration-get-slave-addresses
       - inject:
           properties-file: 'slave_addresses.txt'
-      - integration-get-bundle-vars
-      - inject:
-          properties-file: 'bundle_vars.txt'
+      - integration-detect-variables
       - integration-configure-clustering
       - integration-start-cluster-run-test
       - integration-cleanup-tmp
@@ -748,15 +780,15 @@
                 display-table: true
                 format: csv
       - integration-csit-archive-build
-      - opendaylight-infra-shiplogs:
-          maven-version: 'mvn33'
+      - integration-csit-run-postscript
+      - lf-infra-publish
 
 - job-template:
     name: '{project}-csit-3node-periodic-{functionality}-{install}-{stream}'
     disabled: false
 
     project-type: freestyle
-    node: centos7-robot-2c-2g
+    node: centos7-robot-2c-8g
 
     properties:
       - opendaylight-infra-properties:
@@ -773,8 +805,8 @@
           branch: '{branch}'
       - integration-distribution-stream:
           stream: '{stream}'
-      - integration-bundleurl:
-          bundleurl: '{bundleurl}'
+      - integration-bundle-url:
+          bundle-url: '{bundle-url}'
       - integration-controller-scope:
           controller-scope: '{scope}'
       - integration-controller-features:
@@ -785,10 +817,16 @@
           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:
@@ -815,9 +853,7 @@
       - integration-get-slave-addresses
       - inject:
           properties-file: 'slave_addresses.txt'
-      - integration-get-bundle-vars
-      - inject:
-          properties-file: 'bundle_vars.txt'
+      - integration-detect-variables
       - integration-configure-clustering
       - integration-start-cluster-run-test
       - integration-cleanup-tmp
@@ -971,15 +1007,15 @@
                 exclude: '{10-exclude-value}'
                 format: csv
       - integration-csit-archive-build
-      - opendaylight-infra-shiplogs:
-          maven-version: 'mvn33'
+      - integration-csit-run-postscript
+      - lf-infra-publish
 
 - job-template:
     name: '{project}-csit-hwvtep-{topology}-openstack-{openstack}-{functionality}-{stream}'
     disabled: false
 
     project-type: freestyle
-    node: centos7-robot-2c-2g
+    node: centos7-robot-2c-8g
     concurrent: true
 
     properties:
@@ -997,22 +1033,34 @@
           branch: '{branch}'
       - integration-distribution-stream:
           stream: '{stream}'
-      - integration-bundleurl:
-          bundleurl: '{bundleurl}'
+      - integration-bundle-url:
+          bundle-url: '{bundle-url}'
       - integration-controller-features:
           controller-features: '{install-features}'
+      - integration-controller-debug-map:
+          controller-debug-map: '{debug-map}'
       - integration-test-options:
           test-options: '{robot-options}'
       - integration-test-plan:
           test-plan: '{testplan}'
+      - 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: '{use-features-boot}'
       - string:
           name: OPENSTACK_BRANCH
           default: '{openstack-branch}'
           description: 'Openstack version to use with devstack'
+      - string:
+          name: DEVSTACK_HASH
+          default: '{devstack-hash}'
+          description: 'devstack hash to checkout'
       - string:
           name: ODL_ML2_DRIVER_REPO
           default: '{odl-ml2-driver-repo}'
@@ -1038,6 +1086,10 @@
           name: DEVSTACK_LBAAS_PLUGIN_REPO
           default: '{devstack-lbaas-plugin-repo}'
           description: 'URL to fetch neutron-lbaas devstack plugin'
+      - string:
+          name: DEVSTACK_NETWORKING_SFC_PLUGIN_REPO
+          default: '{devstack-networking-sfc-plugin-repo}'
+          description: 'URL to fetch neutron-lbaas devstack plugin'
       - string:
           name: ODL_ENABLE_L3_FWD
           default: '{odl-enable-l3}'
@@ -1057,7 +1109,11 @@
       - string:
           name: ENABLE_OS_SERVICES
           default: '{enable-openstack-services}'
-          description: 'comma seperated list of services to enable'
+          description: 'comma separated list of services to enable on controller nodes'
+      - string:
+          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_PLUGINS
           default: '{enable-openstack-plugins}'
@@ -1095,6 +1151,14 @@
           default: '{lbaas-service-provider}'
           description: 'The NEUTRON_LBAAS_SERVICE_PROVIDERV2 value to be used in local.conf - only relevant when using
           neutron-lbaas'
+      - string:
+          name: ODL_SFC_DRIVER
+          default: '{odl-sfc-driver}'
+          description: 'The SFC driver to be used in local.conf - only relevant when using networking-sfc'
+      - string:
+          name: ODL_SNAT_MODE
+          default: '{odl-snat-mode}'
+          description: 'The SNAT mode to be configured - options are conntrack/controller.'
     scm:
       - integration-gerrit-scm:
           basedir: 'test'
@@ -1109,25 +1173,27 @@
       - timed: '{schedule}'
 
     builders:
-      - integration-infra-stack-3-type:
+      - integration-infra-stack-4-type:
+          stack-template: '{stack-template}'
           vm_0_count: '{odl_system_count}'
           vm_0_flavor: '{odl_system_flavor}'
           vm_0_image: '{odl_system_image}'
           vm_1_count: '{openstack_system_count}'
           vm_1_flavor: '{openstack_system_flavor}'
           vm_1_image: '{openstack_system_image}'
-          vm_2_count: '{tools_system_count}'
-          vm_2_flavor: '{tools_system_flavor}'
-          vm_2_image: '{tools_system_image}'
+          vm_2_count: '{openstack_system2_count}'
+          vm_2_flavor: '{openstack_system2_flavor}'
+          vm_2_image: '{openstack_system2_image}'
+          vm_3_count: '{tools_system_count}'
+          vm_3_flavor: '{tools_system_flavor}'
+          vm_3_image: '{tools_system_image}'
       - integration-install-robotframework
       - inject:
           properties-file: 'env.properties'
       - integration-get-slave-addresses
       - inject:
           properties-file: 'slave_addresses.txt'
-      - integration-get-bundle-vars
-      - inject:
-          properties-file: 'bundle_vars.txt'
+      - integration-detect-variables
       - integration-deploy-controller-run-test
       - integration-deploy-openstack-run-test
       - integration-cleanup-tmp
@@ -1140,15 +1206,15 @@
           email-recipients: '{email-recipients}'
           email-prefix: '[{project}]'
       - integration-csit-archive-build
-      - opendaylight-infra-shiplogs:
-          maven-version: 'mvn33'
+      - integration-csit-run-postscript
+      - lf-infra-publish
 
 - job-template:
     name: '{project}-csit-{topology}-openstack-{openstack}-{functionality}-{stream}'
     disabled: false
 
     project-type: freestyle
-    node: centos7-robot-2c-2g
+    node: centos7-robot-2c-8g
     concurrent: true
 
     properties:
@@ -1166,22 +1232,34 @@
           branch: '{branch}'
       - integration-distribution-stream:
           stream: '{stream}'
-      - integration-bundleurl:
-          bundleurl: '{bundleurl}'
+      - integration-bundle-url:
+          bundle-url: '{bundle-url}'
       - integration-controller-features:
           controller-features: '{install-features}'
+      - integration-controller-debug-map:
+          controller-debug-map: '{debug-map}'
       - integration-test-options:
           test-options: '{robot-options}'
       - integration-test-plan:
           test-plan: '{testplan}'
+      - 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: '{use-features-boot}'
       - string:
           name: OPENSTACK_BRANCH
           default: '{openstack-branch}'
           description: 'Openstack version to use with devstack'
+      - string:
+          name: DEVSTACK_HASH
+          default: '{devstack-hash}'
+          description: 'devstack hash to checkout'
       - string:
           name: ODL_ML2_DRIVER_REPO
           default: '{odl-ml2-driver-repo}'
@@ -1207,6 +1285,10 @@
           name: DEVSTACK_LBAAS_PLUGIN_REPO
           default: '{devstack-lbaas-plugin-repo}'
           description: 'URL to fetch neutron-lbaas devstack plugin'
+      - string:
+          name: DEVSTACK_NETWORKING_SFC_PLUGIN_REPO
+          default: '{devstack-networking-sfc-plugin-repo}'
+          description: 'URL to fetch neutron-lbaas devstack plugin'
       - string:
           name: ODL_ENABLE_L3_FWD
           default: '{odl-enable-l3}'
@@ -1227,6 +1309,10 @@
           name: ENABLE_OS_SERVICES
           default: '{enable-openstack-services}'
           description: 'comma seperated list of services to enable'
+      - string:
+          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_PLUGINS
           default: '{enable-openstack-plugins}'
@@ -1268,6 +1354,14 @@
           name: NUM_OPENSTACK_SITES
           default: '{num-openstack-sites}'
           description: 'Number of openstack sites'
+      - string:
+          name: ODL_SFC_DRIVER
+          default: '{odl-sfc-driver}'
+          description: 'The SFC driver to be used in local.conf - only relevant when using networking-sfc'
+      - string:
+          name: ODL_SNAT_MODE
+          default: '{odl-snat-mode}'
+          description: 'The SNAT mode to be configured - options are conntrack/controller.'
 
     scm:
       - integration-gerrit-scm:
@@ -1283,7 +1377,7 @@
       - timed: '{schedule}'
 
     builders:
-      - integration-infra-stack:
+      - integration-infra-stack-3-type:
           stack-template: '{stack-template}'
           vm_0_count: '{odl_system_count}'
           vm_0_flavor: '{odl_system_flavor}'
@@ -1291,15 +1385,16 @@
           vm_1_count: '{openstack_system_count}'
           vm_1_flavor: '{openstack_system_flavor}'
           vm_1_image: '{openstack_system_image}'
+          vm_2_count: '{openstack_system2_count}'
+          vm_2_flavor: '{openstack_system2_flavor}'
+          vm_2_image: '{openstack_system2_image}'
       - integration-install-robotframework
       - inject:
           properties-file: 'env.properties'
       - integration-get-slave-addresses
       - inject:
           properties-file: 'slave_addresses.txt'
-      - integration-get-bundle-vars
-      - inject:
-          properties-file: 'bundle_vars.txt'
+      - integration-detect-variables
       - integration-deploy-controller-run-test
       - integration-deploy-openstack-run-test
       - integration-cleanup-tmp
@@ -1312,8 +1407,8 @@
           email-recipients: '{email-recipients}'
           email-prefix: '[{project}]'
       - integration-csit-archive-build
-      - opendaylight-infra-shiplogs:
-          maven-version: 'mvn33'
+      - integration-csit-run-postscript
+      - lf-infra-publish
 
 # Template: {project}-patch-test-{stream}
 # Goal: Build a patch and run project specific system test on a distribution containing the change
@@ -1321,10 +1416,11 @@
 # 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: maven
-    node: centos7-java-builder-2c-8g
+    project-type: freestyle
+    node: centos7-builder-2c-8g
     concurrent: true
     jdk: '{jdk}'
 
@@ -1337,16 +1433,20 @@
           os-cloud: '{os-cloud}'
           project: '{project}'
           branch: '{branch}'
-          refspec: '$GERRIT_REFSPEC'
+          refspec: 'refs/heads/{branch}'
           artifacts: '{archive-artifacts}'
       - integration-distribution-branch:
           branch: '{branch}'
+      - distribution-karaf-version:
+          karaf-version: '{karaf-version}'
       - integration-distribution-git-url:
           git-url: '{git-url}'
       - string:
           name: feature
           default: 'all'
           description: 'Specific feature test for patch'
+      - maven-exec:
+          maven-version: mvn33
 
     scm:
       - integration-gerrit-scm:
@@ -1362,7 +1462,7 @@
 
     triggers:
       - gerrit:
-          server-name: '{server-name}'
+          server-name: '{gerrit-server-name}'
           trigger-on:
             - comment-added-contains-event:
                 comment-contains-value: 'test-{project}-all'
@@ -1380,56 +1480,48 @@
             unstable: true
             notbuilt: true
 
-    prebuilders:
+    builders:
       - integration-rebase-gerrit-patch
-      - integration-get-bundle-url
-      - inject:
-          properties-file: 'bundle.txt'
       - wipe-org-opendaylight-repo
-      - provide-maven-settings:
-          global-settings-file: 'odl-global-settings'
-          settings-file: 'integration-settings'
       - maven-target:
-          maven-version: 'mvn33'
+          maven-version: mvn33
           pom: '{project}/pom.xml'
-          goals: >
+          goals: |
               clean install dependency:tree
-              -V -B -Pq
+              -Pq
               -Dgitid.skip=false
-              -Djenkins
               -DgenerateReports=false
-              -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r
               -Dstream={stream}
+              {opendaylight-infra-mvn-opts}
+          # TODO: {opendaylight-infra-parallel-mvn-opts}?
           java-opts:
             - '-Xmx4096m -XX:MaxPermSize=1024m -Dmaven.compile.fork=true'
-          settings: 'integration-settings'
+          settings: integration-settings
           settings-type: cfp
-          global-settings: 'odl-global-settings'
+          global-settings: global-settings
           global-settings-type: cfp
-
-    maven:
-      maven-name: 'mvn33'
-      root-pom: 'distribution/pom.xml'
-      goals: >
-          clean install dependency:tree
-          -V -B -Pq
-          -Dgitid.skip=false
-          -Djenkins
-          -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r
-      maven-opts: '-Xmx1024m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
-      settings: 'integration-settings'
-      settings-type: cfp
-      global-settings: 'odl-global-settings'
-      global-settings-type: cfp
-      ignore-upstream-changes: true
-      post-step-run-condition: 'SUCCESS'
-
-    postbuilders:
+      - maven-target:
+          maven-version: mvn33
+          pom: distribution/pom.xml
+          goals: |
+              clean install dependency:tree
+              -Pq
+              -Dgitid.skip=false
+              {opendaylight-infra-parallel-mvn-opts}
+          java-opts:
+            - '-Xmx1024m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
+          settings: integration-settings
+          settings-type: cfp
+          global-settings: global-settings
+          global-settings-type: cfp
+      - integration-upload-distribution:
+          dist-pom: distribution/pom.xml
       - trigger-builds:
           - project: '{csit-list}'
             block: true
-            predefined-parameters:
-              BUNDLEURL=$BUNDLEURL
+            predefined-parameters: |
+              BUNDLE_URL=$BUNDLE_URL
+              KARAF_VERSION=$KARAF_VERSION
 
     publishers:
       - email-notification: