Merge "Remove SM distribution jobs"
[releng/builder.git] / jjb / integration / integration-templates.yaml
index f3b39a4d7121e6c9ba80d37884e17c428b9c62d2..7b52bd5827e5ed0e335dedb5dab1f810136f479a 100644 (file)
@@ -5,8 +5,6 @@
 # {project}-csit-1node-{functionality}-{install}-{stream}
 # {project}-csit-3node-docker-{functionality}-{install}-{stream}
 # {project}-csit-3node-{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}
@@ -30,7 +28,7 @@
 # Anchors #
 ###########
 
-- inttest_csit_common: &inttest_csit_common
+- _inttest_csit_common: &inttest_csit_common
     name: inttest-csit-common
     # Defines common configuration to all CSIT jobs
 
@@ -47,7 +45,7 @@
     #####################
 
     project-type: freestyle
-    node: centos7-robot-2c-8g
+    node: centos8-robot-2c-8g
     concurrent: true
     disabled: "{disable-job}"
 
     openstack-heat-template: csit-2-instance-type.yaml
     openstack-heat-template-dir: openstack-hot
 
-    odl_system_flavor: "odl-highcpu-4"
-    odl_system_image: "ZZCI - CentOS 7 - builder - x86_64 - 20200901-060217.896"
-    controller-max-mem: "2048m"
-    tools_system_count: "1"
-    tools_system_flavor: "odl-highcpu-2"
-    tools_system_image: "ZZCI - Ubuntu 16.04 - mininet-ovs-28 - x86_64 - 20200813-051640.743"
-
     #####################
     # Job configuration #
     #####################
           install-features: "{install-features}"
           use-features-boot: "True"
           elasticsearch-attribute: "{elasticsearch-attribute}"
+          karaf-based-controller: "{karaf-based-controller}"
+          karaf-version: "{karaf-version}"
       - integration-stack-2-type:
           vm_0_count: "1"
           vm_0_flavor: "{odl_system_flavor}"
           test-plan: "{project}-{functionality}.txt"
       - integration-jdk-version:
           jdkversion: "{verify-jdkversion}"
-      - distribution-karaf-version:
-          karaf-version: "{verify-karaf-version}"
 
     scm:
       - integration-gerrit-scm:
 # inttest-csit-1node #
 ######################
 
-- inttest_csit_1node: &inttest_csit_1node
+- _inttest_csit_1node: &inttest_csit_1node
     name: inttest-csit-1node
 
     #####################
     openstack-heat-template: csit-2-instance-type.yaml
     openstack-heat-template-dir: openstack-hot
 
-    odl_system_flavor: "odl-highcpu-4"
-    odl_system_image: "ZZCI - CentOS 7 - builder - x86_64 - 20200901-060217.896"
-    controller-max-mem: "2048m"
-    tools_system_count: "1"
-    tools_system_flavor: "odl-highcpu-2"
-    tools_system_image: "ZZCI - Ubuntu 16.04 - mininet-ovs-28 - x86_64 - 20200813-051640.743"
-    controller-is-a-karaf-feature: "True"
-
     #####################
     # Job configuration #
     #####################
 
     parameters:
-      - string:
-          name: IS_KARAF_APPL
-          description: "Boolean to let pipeline know if the project has a different deployer"
-          default: "{controller-is-a-karaf-feature}"
-
       - integration-csit-parameters:
           archive-artifacts: "{archive-artifacts}"
           branch: "{branch}"
           install-features: "{install-features}"
           use-features-boot: "True"
           elasticsearch-attribute: "{elasticsearch-attribute}"
+          karaf-based-controller: "{karaf-based-controller}"
+          karaf-version: "{karaf-version}"
       - integration-stack-2-type:
           vm_0_count: "1"
           vm_0_flavor: "{odl_system_flavor}"
           branch: "master"
       - integration-jdk-version:
           jdkversion: "{jre}"
-      - distribution-karaf-version:
-          karaf-version: "{karaf-version}"
 
     scm:
       - integration-gerrit-scm:
     # yamllint disable-line rule:key-duplicates
     <<: *inttest_csit_1node
 
-- job-template:
-    name: "{prefix}{project}-csit-1node-{functionality}-{install}-{stream}"
-    id: inttest-csit-1node-custom
-    <<: *inttest_csit_common
-    # yamllint disable-line rule:key-duplicates
-    <<: *inttest_csit_1node
-
-    parameters:
-      - integration-csit-parameters:
-          archive-artifacts: "{archive-artifacts}"
-          branch: "{branch}"
-          os-cloud: "{os-cloud}"
-          # CSIT
-          bundle-url: "{bundle-url}"
-          repo-url: "{repo-url}"
-          robot-options: "{robot-options}"
-          # Controller
-          controller-scope: "{install}"
-          controller-max-mem: "{controller-max-mem}"
-          debug-map: "{debug-map}"
-          install-features: "{install-features}"
-          use-features-boot: "True"
-          elasticsearch-attribute: "{elasticsearch-attribute}"
-      - integration-stack-2-type:
-          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-distribution-branch:
-          branch: "{branch}"
-      - integration-distribution-stream:
-          stream: "{stream}"
-      - integration-script-plan:
-          script-plan: "{project}.txt"
-      - integration-config-plan:
-          config-plan: "{project}.txt"
-      - integration-stream-test-plan:
-          stream-test-plan: "{project}-{functionality}-{stream}.txt"
-      - 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}"
-
 - job-template:
     name: "{prefix}{project}-csit-verify-3node-{functionality}"
     id: inttest-csit-verify-3node
     openstack-heat-template: csit-2-instance-type.yaml
     openstack-heat-template-dir: openstack-hot
 
-    odl_system_flavor: "odl-highcpu-4"
-    odl_system_image: "ZZCI - CentOS 7 - builder - x86_64 - 20200901-060217.896"
-    controller-max-mem: "2048m"
-    tools_system_count: "1"
-    tools_system_flavor: "odl-highcpu-2"
-    tools_system_image: "ZZCI - Ubuntu 16.04 - mininet-ovs-28 - x86_64 - 20200813-051640.743"
-
     #####################
     # Job Configuration #
     #####################
           install-features: "odl-jolokia,{install-features}"
           use-features-boot: "True"
           elasticsearch-attribute: "{elasticsearch-attribute}"
+          karaf-based-controller: "{karaf-based-controller}"
+          karaf-version: "{karaf-version}"
       - integration-stack-2-type:
           vm_0_count: "3"
           vm_0_flavor: "{odl_system_flavor}"
           test-suites: "{test-suites}"
       - integration-jdk-version:
           jdkversion: "{verify-jdkversion}"
-      - distribution-karaf-version:
-          karaf-version: "{verify-karaf-version}"
 
     scm:
       - integration-gerrit-scm:
 # inttest-csit-3node #
 ######################
 
-- inttest_csit_3node: &inttest_csit_3node
+- _inttest_csit_3node: &inttest_csit_3node
     name: inttest-csit-3node
 
     #####################
     openstack-heat-template: csit-2-instance-type.yaml
     openstack-heat-template-dir: openstack-hot
 
-    odl_system_flavor: "odl-highcpu-4"
-    odl_system_image: "ZZCI - CentOS 7 - builder - x86_64 - 20200901-060217.896"
-    controller-max-mem: "2048m"
-    tools_system_count: "1"
-    tools_system_flavor: "odl-highcpu-2"
-    tools_system_image: "ZZCI - Ubuntu 16.04 - mininet-ovs-28 - x86_64 - 20200813-051640.743"
-
     #####################
     # Job configuration #
     #####################
           install-features: "odl-jolokia,{install-features}"
           use-features-boot: "True"
           elasticsearch-attribute: "{elasticsearch-attribute}"
+          karaf-based-controller: "{karaf-based-controller}"
+          karaf-version: "{karaf-version}"
       - integration-stack-2-type:
           vm_0_count: "3"
           vm_0_flavor: "{odl_system_flavor}"
           branch: "master"
       - integration-jdk-version:
           jdkversion: "{jre}"
-      - distribution-karaf-version:
-          karaf-version: "{karaf-version}"
 
     scm:
       - integration-gerrit-scm:
           install-features: "odl-jolokia,{install-features}"
           use-features-boot: "True"
           elasticsearch-attribute: "{elasticsearch-attribute}"
+          karaf-based-controller: "{karaf-based-controller}"
+          karaf-version: "{karaf-version}"
       - integration-stack-2-type:
           vm_0_count: "3"
           vm_0_flavor: "{odl_system_flavor}"
           branch: "master"
       - integration-jdk-version:
           jdkversion: "{jre}"
-      - distribution-karaf-version:
-          karaf-version: "{karaf-version}"
 
 - job-template:
     name: "{prefix}{project}-csit-3node-docker-{functionality}-{install}-{stream}"
     openstack-heat-template: csit-2-instance-type.yaml
     openstack-heat-template-dir: openstack-hot
 
-    odl_system_count: 1
-    odl_system_flavor: "odl-highcpu-4"
-    odl_system_image: "ZZCI - CentOS 7 - builder - x86_64 - 20200901-060217.896"
-    controller-max-mem: "2048m"
     docker_system_count: "1"
-    docker_system_flavor: "odl-standard-1"
-    docker_system_image: "ZZCI - CentOS 7 - docker - x86_64 - 20200901-220018.955"
+    docker_system_flavor: "v3-standard-2"
+    docker_system_image: "ZZCI - CentOS 7 - docker - x86_64 - 20230401-220108.252"
 
     #####################
     # Job Configuration #
           install-features: "odl-jolokia,{install-features}"
           use-features-boot: "True"
           elasticsearch-attribute: "{elasticsearch-attribute}"
+          karaf-based-controller: "{karaf-based-controller}"
+          karaf-version: "{karaf-version}"
       - integration-stack-2-type:
           vm_0_count: "3"
           vm_0_flavor: "{odl_system_flavor}"
           branch: "master"
       - integration-jdk-version:
           jdkversion: "{jre}"
-      - distribution-karaf-version:
-          karaf-version: "{karaf-version}"
 
     scm:
       - integration-gerrit-scm:
           openstack-cloud: "{openstack-cloud}"
       - lf-infra-publish
 
-#################################
-# inttest-csit-hwvtep-openstack #
-#################################
-
-- inttest_csit_hwvtep_openstack: &inttest_csit_hwvtep_openstack
-    name: inttest-csit-hwvtep-openstack
-
-    #####################
-    # Default variables #
-    #####################
-
-    openstack-cloud: vex
-    openstack-heat-template: csit-4-instance-type.yaml
-    openstack-heat-template-dir: openstack-hot
-
-    odl_system_count: 1
-    odl_system_flavor: "odl-highcpu-4"
-    odl_system_image: "ZZCI - CentOS 7 - builder - x86_64 - 20200901-060217.896"
-    controller-max-mem: "2048m"
-    openstack_system_count: 1
-    openstack_system_flavor: "odl-standard-4"
-    openstack_system_image: "ZZCI - CentOS 7 - devstack - x86_64 - 20200813-052044.669"
-    openstack_system2_count: 0
-    openstack_system2_flavor: "odl-standard-1"
-    openstack_system2_image: "ZZCI - CentOS 7 - devstack - x86_64 - 20200813-052044.669"
-    tools_system_count: 1
-    tools_system_flavor: "odl-highcpu-2"
-    tools_system_image: "ZZCI - Ubuntu 16.04 - mininet-ovs-28 - x86_64 - 20200813-051640.743"
-
-    #####################
-    # Job configuration #
-    #####################
-
-    parameters:
-      - integration-csit-parameters:
-          archive-artifacts: "{archive-artifacts}"
-          branch: "{branch}"
-          os-cloud: "{os-cloud}"
-          # CSIT
-          bundle-url: "{bundle-url}"
-          repo-url: "{repo-url}"
-          robot-options: "{robot-options}"
-          # Controller
-          controller-scope: ""
-          controller-max-mem: "{controller-max-mem}"
-          debug-map: "{debug-map}"
-          install-features: "{install-features}"
-          use-features-boot: "{use-features-boot}"
-          elasticsearch-attribute: "{elasticsearch-attribute}"
-      - integration-stack-4-type:
-          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: "{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-distribution-branch:
-          branch: "{branch}"
-      - integration-distribution-stream:
-          stream: "{stream}"
-      - integration-script-plan:
-          script-plan: "{project}.txt"
-      - integration-config-plan:
-          config-plan: "{project}.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}"
-      - 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}"
-          description: "URL to fetch networking-odl driver"
-      - string:
-          name: ODL_ML2_BRANCH
-          default: "{odl-ml2-branch}"
-          description: "Version of networking-odl to checkout from the repo"
-      - string:
-          name: ODL_ML2_DRIVER_VERSION
-          default: "{odl-ml2-driver-version}"
-          description: "Mode of networking-odl (v1 or v2)"
-      - string:
-          name: ODL_ML2_PORT_BINDING
-          default: "{odl-ml2-port-binding}"
-          description: >
-            Method of networking-odl port-binding (pseudo-agentdb-binding or
-            legacy-port-binding or network-topology)
-      - string:
-          name: DEVSTACK_KUBERNETES_PLUGIN_REPO
-          default: "{devstack-kubernetes-plugin-repo}"
-          description: "URL to fetch kubernetes devstack plugin"
-      - string:
-          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: IPSEC_VXLAN_TUNNELS_ENABLED
-          default: "{ipsec-vxlan-tunnels-enabled}"
-          description: "Enable ipsec over vxlan support for all controllers and computes"
-      - string:
-          name: PUBLIC_BRIDGE
-          default: "{public-bridge}"
-          description: "Specifies public bridge for provider and external networking"
-      - string:
-          name: ENABLE_HAPROXY_FOR_NEUTRON
-          default: "{enable-haproxy}"
-          description: "Enable HAProxy for using neutron interface as HA"
-      - string:
-          name: ENABLE_OS_SERVICES
-          default: "{enable-openstack-services}"
-          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_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}"
-          description: "comma seperated list of plugins to enable"
-      - string:
-          name: DISABLE_OS_SERVICES
-          default: "{disable-openstack-services}"
-          description: "comma seperated list of services to enable"
-      - string:
-          name: TENANT_NETWORK_TYPE
-          default: "{tenant-network-type}"
-          description: "Tenant Network Type supported by the implementation"
-      - string:
-          name: SECURITY_GROUP_MODE
-          default: "{security-group-mode}"
-          description: "Security Group Mode to be used in netvirt aclservice config"
-      - string:
-          name: ENABLE_ITM_DIRECT_TUNNELS
-          default: "{enable-itm-direct-tunnels}"
-          description: "Tunnel Configuration mode to be used in genius ifm config"
-      - string:
-          name: PUBLIC_PHYSICAL_NETWORK
-          default: "{public-physical-network}"
-          description: "provider physical network used for flat/vlan networks"
-      - string:
-          name: ENABLE_NETWORKING_L2GW
-          default: "{enable-networking-l2gw}"
-          description: "Enable networking L2gw"
-      - string:
-          name: NETWORKING_L2GW_DRIVER
-          default: "{networking-l2gw-repo}"
-          description: "URL to fetch networking-l2gw driver"
-      - string:
-          name: CREATE_INITIAL_NETWORKS
-          default: "{create-initial-networks}"
-          description: "Toggles the option of letting devstack create initial networks (True/False)"
-      - string:
-          name: LBAAS_SERVICE_PROVIDER
-          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."
-      - string:
-          name: GROUP_ADD_MOD_ENABLED
-          default: "{group-add-mod-enabled}"
-          description: "The Group add mod enabled mode to be configured - options are true/false."
-      - string:
-          name: OVS_INSTALL
-          default: "{ovs-install}"
-          description: >
-            Install a custom OVS. It can be an OVS version to build
-            (like v2.9.2 or v2.6.1-nsh) or a yum repo url to pull from.
-
-    scm:
-      - integration-gerrit-scm:
-          basedir: "test"
-          refspec: "$PATCHREFSPEC"
-          branch: "master"
-
-    triggers:
-      - timed: "{schedule}"
-
-    builders:
-      - lf-infra-pre-build
-      - integration-stack-4-type:
-          openstack-cloud: "{openstack-cloud}"
-          openstack-heat-template: "{openstack-heat-template}"
-          openstack-heat-template-dir: "{openstack-heat-template-dir}"
-      - 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-deploy-openstack-run-test
-      - integration-cleanup-tmp
-
-    publishers:
-      - email-notification:
-          email-recipients: "{email-recipients}"
-          email-prefix: "[{project}]"
-      - integration-csit-collect-netvirt-logs
-      - integration-csit-publish:
-          robot_other_files:
-            - tempest_results.html
-          robot-pass-threshold: 100.0
-          robot-unstable-threshold: 0.0
-      - lf-stack-delete:
-          openstack-cloud: "{openstack-cloud}"
-      - lf-infra-publish
+# Template: {project}-mri-patch-test-{stream}
+# Goal: Build a patch and run project specific system test on a mri projects distribution containing the change
+# Operation: This job template builds a patch, uses the projects distribution and triggers the project system
+# test defined in {csit-list} when gerrit receives test-{project} keyword
 
 - job-template:
-    # yamllint disable-line rule:line-length
-    name: "{prefix}{project}-csit-hwvtep-{topology}-{os-cmb-cnt}cmb-{os-ctl-cnt}ctl-{os-cmp-cnt}cmp-openstack-{openstack}-{functionality}-{stream}"
-    id: inttest-csit-hwvtep-openstack
+    name: "{prefix}{project}-mri-patch-test-{feature}-{stream}"
+    id: inttest-mri-patch-test
     <<: *inttest_csit_common
-    # yamllint disable-line rule:key-duplicates
-    <<: *inttest_csit_hwvtep_openstack
 
-- job-template:
-    # yamllint disable-line rule:line-length
-    name: "{prefix}{project}-csit-hwvtep-{topology}-{os-cmb-cnt}cmb-{os-ctl-cnt}ctl-{os-cmp-cnt}cmp-openstack-{openstack}-{functionality}-{stream}"
-    id: inttest-csit-hwvtep-openstack-custom
-    <<: *inttest_csit_common
-    # yamllint disable-line rule:key-duplicates
-    <<: *inttest_csit_hwvtep_openstack
+    build-timeout: 720
 
     parameters:
-      - integration-csit-parameters:
-          archive-artifacts: "{archive-artifacts}"
-          branch: "{branch}"
+      - opendaylight-infra-parameters:
           os-cloud: "{os-cloud}"
-          # CSIT
-          bundle-url: "{bundle-url}"
-          repo-url: "{repo-url}"
-          robot-options: "{robot-options}"
-          # Controller
-          controller-scope: ""
-          controller-max-mem: "{controller-max-mem}"
-          debug-map: "{debug-map}"
-          install-features: "{install-features}"
-          use-features-boot: "{use-features-boot}"
-          elasticsearch-attribute: "{elasticsearch-attribute}"
-      - integration-stack-4-type:
-          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: "{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-distribution-branch:
-          branch: "{branch}"
-      - integration-distribution-stream:
-          stream: "{stream}"
-      - integration-script-plan:
-          script-plan: "{project}.txt"
-      - integration-config-plan:
-          config-plan: "{project}.txt"
-      - 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}"
-      - 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}"
-          description: "URL to fetch networking-odl driver"
-      - string:
-          name: ODL_ML2_BRANCH
-          default: "{odl-ml2-branch}"
-          description: "Version of networking-odl to checkout from the repo"
-      - string:
-          name: ODL_ML2_DRIVER_VERSION
-          default: "{odl-ml2-driver-version}"
-          description: "Mode of networking-odl (v1 or v2)"
-      - string:
-          name: ODL_ML2_PORT_BINDING
-          default: "{odl-ml2-port-binding}"
-          description: |
-            Method of networking-odl port-binding (pseudo-agentdb-binding or
-            legacy-port-binding or network-topology)
-      - string:
-          name: DEVSTACK_KUBERNETES_PLUGIN_REPO
-          default: "{devstack-kubernetes-plugin-repo}"
-          description: "URL to fetch kubernetes devstack plugin"
-      - string:
-          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: IPSEC_VXLAN_TUNNELS_ENABLED
-          default: "{ipsec-vxlan-tunnels-enabled}"
-          description: "Enable ipsec over vxlan support for all controllers and computes"
-      - string:
-          name: PUBLIC_BRIDGE
-          default: "{public-bridge}"
-          description: "Specifies public bridge for provider and external networking"
-      - string:
-          name: ENABLE_HAPROXY_FOR_NEUTRON
-          default: "{enable-haproxy}"
-          description: "Enable HAProxy for using neutron interface as HA"
-      - string:
-          name: ENABLE_OS_SERVICES
-          default: "{enable-openstack-services}"
-          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_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}"
-          description: "comma seperated list of plugins to enable"
-      - string:
-          name: DISABLE_OS_SERVICES
-          default: "{disable-openstack-services}"
-          description: "comma seperated list of services to enable"
-      - string:
-          name: TENANT_NETWORK_TYPE
-          default: "{tenant-network-type}"
-          description: "Tenant Network Type supported by the implementation"
-      - string:
-          name: SECURITY_GROUP_MODE
-          default: "{security-group-mode}"
-          description: "Security Group Mode to be used in netvirt aclservice config"
-      - string:
-          name: ENABLE_ITM_DIRECT_TUNNELS
-          default: "{enable-itm-direct-tunnels}"
-          description: "Tunnel Configuration mode to be used in genius ifm config"
-      - string:
-          name: PUBLIC_PHYSICAL_NETWORK
-          default: "{public-physical-network}"
-          description: "provider physical network used for flat/vlan networks"
-      - string:
-          name: ENABLE_NETWORKING_L2GW
-          default: "{enable-networking-l2gw}"
-          description: "Enable networking L2gw"
-      - string:
-          name: NETWORKING_L2GW_DRIVER
-          default: "{networking-l2gw-repo}"
-          description: "URL to fetch networking-l2gw driver"
-      - string:
-          name: CREATE_INITIAL_NETWORKS
-          default: "{create-initial-networks}"
-          description: "Toggles the option of letting devstack create initial networks (True/False)"
-      - string:
-          name: LBAAS_SERVICE_PROVIDER
-          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."
-      - string:
-          name: GROUP_ADD_MOD_ENABLED
-          default: "{group-add-mod-enabled}"
-          description: "The Group add mod enabled mode to be configured - options are true/false."
-      - string:
-          name: OVS_INSTALL
-          default: "{ovs-install}"
-          description: |
-            Install a custom OVS. It can be an OVS version to build (like
-            v2.9.2 or v2.6.1-nsh) or a yum repo url to pull from.
-
-##########################
-# inttest-csit-openstack #
-##########################
-
-- inttest_csit_openstack: &inttest_csit_openstack
-    name: inttest-csit-openstack
-
-    #####################
-    # Default variables #
-    #####################
-
-    openstack-cloud: vex
-    openstack-heat-template: csit-4-instance-type.yaml
-    openstack-heat-template-dir: openstack-hot
-
-    odl_system_count: 1
-    odl_system_flavor: "odl-highcpu-4"
-    odl_system_image: "ZZCI - CentOS 7 - builder - x86_64 - 20200901-060217.896"
-    controller-max-mem: "2048m"
-    openstack_system_count: 1
-    openstack_system_flavor: "odl-standard-4"
-    openstack_system_image: "ZZCI - CentOS 7 - devstack - x86_64 - 20200813-052044.669"
-    openstack_system2_count: 0
-    openstack_system2_flavor: "odl-standard-1"
-    openstack_system2_image: "ZZCI - CentOS 7 - devstack - x86_64 - 20200813-052044.669"
-    tools_system_count: 1
-    tools_system_flavor: "odl-highcpu-2"
-    tools_system_image: "ZZCI - Ubuntu 16.04 - mininet-ovs-28 - x86_64 - 20200813-051640.743"
-
-    #####################
-    # Job configuration #
-    #####################
-
-    parameters:
-      - integration-csit-parameters:
-          archive-artifacts: "{archive-artifacts}"
+          project: "{project}"
           branch: "{branch}"
-          os-cloud: "{os-cloud}"
-          # CSIT
-          bundle-url: "{bundle-url}"
-          repo-url: "{repo-url}"
-          robot-options: "{robot-options}"
-          # Controller
-          controller-scope: ""
-          controller-max-mem: "{controller-max-mem}"
-          debug-map: "{debug-map}"
-          install-features: "{install-features}"
-          use-features-boot: "{use-features-boot}"
-          elasticsearch-attribute: "{elasticsearch-attribute}"
-      - integration-stack-4-type:
-          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: "{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}"
+          refspec: "refs/heads/{branch}"
+          artifacts: "{archive-artifacts}"
       - integration-distribution-branch:
           branch: "{branch}"
-      - integration-distribution-stream:
-          stream: "{stream}"
-      - integration-script-plan:
-          script-plan: "{project}.txt"
-      - integration-config-plan:
-          config-plan: "{project}.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-distribution-git-url:
+          git-url: "{git-url}"
       - 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}"
-          description: "URL to fetch networking-odl driver"
-      - string:
-          name: ODL_ML2_BRANCH
-          default: "{odl-ml2-branch}"
-          description: "Version of networking-odl to checkout from the repo"
-      - string:
-          name: ODL_ML2_DRIVER_VERSION
-          default: "{odl-ml2-driver-version}"
-          description: "Mode of networking-odl (v1 or v2)"
-      - string:
-          name: ODL_ML2_PORT_BINDING
-          default: "{odl-ml2-port-binding}"
-          description: |
-            Method of networking-odl port-binding (pseudo-agentdb-binding or
-            legacy-port-binding or network-topology)
-      - string:
-          name: ENABLE_GRE_TYPE_DRIVERS
-          default: "{enable-gre-type-driver}"
-          description: "Enable gre tunnel"
-      - string:
-          name: DEVSTACK_KUBERNETES_PLUGIN_REPO
-          default: "{devstack-kubernetes-plugin-repo}"
-          description: "URL to fetch kubernetes devstack plugin"
-      - string:
-          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: IPSEC_VXLAN_TUNNELS_ENABLED
-          default: "{ipsec-vxlan-tunnels-enabled}"
-          description: "Enable ipsec over vxlan support for all controllers and computes"
-      - string:
-          name: PUBLIC_BRIDGE
-          default: "{public-bridge}"
-          description: "Specifies public bridge for provider and external networking"
-      - string:
-          name: ENABLE_HAPROXY_FOR_NEUTRON
-          default: "{enable-haproxy}"
-          description: "Enable HAProxy for using neutron interface as HA"
-      - string:
-          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_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}"
-          description: "comma seperated list of plugins to enable"
-      - string:
-          name: DISABLE_OS_SERVICES
-          default: "{disable-openstack-services}"
-          description: "comma seperated list of services to enable"
-      - string:
-          name: TENANT_NETWORK_TYPE
-          default: "{tenant-network-type}"
-          description: "Tenant Network Type supported by the implementation"
-      - string:
-          name: SECURITY_GROUP_MODE
-          default: "{security-group-mode}"
-          description: "Security Group Mode to be used in netvirt aclservice config"
-      - string:
-          name: ENABLE_ITM_DIRECT_TUNNELS
-          default: "{enable-itm-direct-tunnels}"
-          description: "Tunnel Configuration mode to be used in genius ifm config"
-      - string:
-          name: PUBLIC_PHYSICAL_NETWORK
-          default: "{public-physical-network}"
-          description: "provider physical network used for flat/vlan networks"
-      - string:
-          name: ENABLE_NETWORKING_L2GW
-          default: "{enable-networking-l2gw}"
-          description: "Enable networking L2gw"
-      - string:
-          name: NETWORKING_L2GW_DRIVER
-          default: "{networking-l2gw-repo}"
-          description: "URL to fetch networking-l2gw driver"
-      - string:
-          name: CREATE_INITIAL_NETWORKS
-          default: "{create-initial-networks}"
-          description: "Toggles the option of letting devstack create initial networks (True/False)"
-      - string:
-          name: LBAAS_SERVICE_PROVIDER
-          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."
-      - string:
-          name: GROUP_ADD_MOD_ENABLED
-          default: "{group-add-mod-enabled}"
-          description: "The Group add mod enabled mode to be configured - options are true/false."
-      - string:
-          name: OVS_INSTALL
-          default: "{ovs-install}"
-          description: |
-            Install a custom OVS. It can be an OVS version to build (like
-            v2.9.2 or v2.6.1-nsh) or a yum repo url to pull from.
+          name: feature
+          default: "all"
+          description: "Specific feature test for patch"
+      - maven-exec:
+          maven-version: "{mvn-version}"
 
     scm:
       - integration-gerrit-scm:
-          basedir: "test"
-          refspec: "$PATCHREFSPEC"
-          branch: "master"
+          basedir: "{project}"
+          refspec: "$GERRIT_REFSPEC"
+          branch: "{branch}"
+      - integration-distribution-scm:
+          branch: "{branch}"
 
     triggers:
-      - timed: "{schedule}"
+      - gerrit:
+          server-name: "{gerrit-server-name}"
+          trigger-on:
+            - comment-added-contains-event:
+                comment-contains-value: "test-{project}-all"
+            - comment-added-contains-event:
+                comment-contains-value: "test-{project}-{feature}"
+          projects:
+            - project-compare-type: "ANT"
+              project-pattern: "{project}"
+              branches:
+                - branch-compare-type: "ANT"
+                  branch-pattern: "**/{branch}"
+          skip-vote:
+            successful: true
+            failed: true
+            unstable: true
+            notbuilt: true
 
     builders:
-      - lf-infra-pre-build
-      - integration-stack-4-type:
-          openstack-cloud: "{openstack-cloud}"
-          openstack-heat-template: "{openstack-heat-template}"
-          openstack-heat-template-dir: "{openstack-heat-template-dir}"
-      - 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-deploy-openstack-run-test
-      - integration-cleanup-tmp
+      - integration-rebase-gerrit-patch
+      - wipe-org-opendaylight-repo
+      - lf-update-java-alternatives:
+          java-version: "{java-version}"
+      - maven-target:
+          maven-version: "{mvn-version}"
+          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}
+          # {opendaylight-infra-parallel-mvn-opts} is bad when there are multiple big features in SFT.
+          java-opts:
+            - "-Xmx4096m -Dmaven.compile.fork=true"
+          settings: integration-settings
+          settings-type: cfp
+          global-settings: global-settings
+          global-settings-type: cfp
+      - integration-upload-distribution:
+          dist-pom: "{project}/pom.xml"
+          settings-project: "{project}"
+      - trigger-builds:
+          - project: "{csit-list}"
+            block: true
+            predefined-parameters: |
+              BUNDLE_URL=$BUNDLE_URL
+              GERRIT_BRANCH=$GERRIT_BRANCH
+              GERRIT_PROJECT=$GERRIT_PROJECT
+              GERRIT_REFSPEC=$GERRIT_REFSPEC
+              KARAF_VERSION=$KARAF_VERSION
 
     publishers:
       - email-notification:
           email-recipients: "{email-recipients}"
           email-prefix: "[{project}]"
-      - integration-csit-collect-netvirt-logs
-      - integration-csit-publish:
-          robot_other_files:
-            - tempest_results.html
-          robot-pass-threshold: 100.0
-          robot-unstable-threshold: 0.0
-      - lf-stack-delete:
-          openstack-cloud: "{openstack-cloud}"
       - lf-infra-publish
 
-- job-template:
-    # yamllint disable-line rule:line-length
-    name: "{prefix}{project}-csit-{topology}-{os-cmb-cnt}cmb-{os-ctl-cnt}ctl-{os-cmp-cnt}cmp-openstack-{openstack}-{functionality}-{stream}"
-    id: inttest-csit-openstack
-    <<: *inttest_csit_common
-    # yamllint disable-line rule:key-duplicates
-    <<: *inttest_csit_openstack
-
-- job-template:
-    # yamllint disable-line rule:line-length
-    name: "{prefix}{project}-csit-{topology}-{os-cmb-cnt}cmb-{os-ctl-cnt}ctl-{os-cmp-cnt}cmp-openstack-{openstack}-{functionality}-{stream}"
-    id: inttest-csit-openstack-custom
-    <<: *inttest_csit_common
-    # yamllint disable-line rule:key-duplicates
-    <<: *inttest_csit_openstack
-
-    parameters:
-      - integration-csit-parameters:
-          archive-artifacts: "{archive-artifacts}"
-          branch: "{branch}"
-          os-cloud: "{os-cloud}"
-          # CSIT
-          bundle-url: "{bundle-url}"
-          repo-url: "{repo-url}"
-          robot-options: "{robot-options}"
-          # Controller
-          controller-scope: ""
-          controller-max-mem: "{controller-max-mem}"
-          debug-map: "{debug-map}"
-          install-features: "{install-features}"
-          use-features-boot: "{use-features-boot}"
-          elasticsearch-attribute: "{elasticsearch-attribute}"
-      - integration-stack-4-type:
-          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: "{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-distribution-branch:
-          branch: "{branch}"
-      - integration-distribution-stream:
-          stream: "{stream}"
-      - integration-script-plan:
-          script-plan: "{project}.txt"
-      - integration-config-plan:
-          config-plan: "{project}.txt"
-      - 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}"
-      - 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}"
-          description: "URL to fetch networking-odl driver"
-      - string:
-          name: ODL_ML2_BRANCH
-          default: "{odl-ml2-branch}"
-          description: "Version of networking-odl to checkout from the repo"
-      - string:
-          name: ODL_ML2_DRIVER_VERSION
-          default: "{odl-ml2-driver-version}"
-          description: "Mode of networking-odl (v1 or v2)"
-      - string:
-          name: ODL_ML2_PORT_BINDING
-          default: "{odl-ml2-port-binding}"
-          description: |
-            Method of networking-odl port-binding (pseudo-agentdb-binding or
-            legacy-port-binding or network-topology)
-      - string:
-          name: ENABLE_GRE_TYPE_DRIVERS
-          default: "{enable-gre-type-driver}"
-          description: "Enable gre tunnel"
-      - string:
-          name: DEVSTACK_KUBERNETES_PLUGIN_REPO
-          default: "{devstack-kubernetes-plugin-repo}"
-          description: "URL to fetch kubernetes devstack plugin"
-      - string:
-          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: IPSEC_VXLAN_TUNNELS_ENABLED
-          default: "{ipsec-vxlan-tunnels-enabled}"
-          description: "Enable ipsec over vxlan support for all controllers and computes"
-      - string:
-          name: PUBLIC_BRIDGE
-          default: "{public-bridge}"
-          description: "Specifies public bridge for provider and external networking"
-      - string:
-          name: ENABLE_HAPROXY_FOR_NEUTRON
-          default: "{enable-haproxy}"
-          description: "Enable HAProxy for using neutron interface as HA"
-      - string:
-          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_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}"
-          description: "comma seperated list of plugins to enable"
-      - string:
-          name: DISABLE_OS_SERVICES
-          default: "{disable-openstack-services}"
-          description: "comma seperated list of services to enable"
-      - string:
-          name: TENANT_NETWORK_TYPE
-          default: "{tenant-network-type}"
-          description: "Tenant Network Type supported by the implementation"
-      - string:
-          name: SECURITY_GROUP_MODE
-          default: "{security-group-mode}"
-          description: "Security Group Mode to be used in netvirt aclservice config"
-      - string:
-          name: ENABLE_ITM_DIRECT_TUNNELS
-          default: "{enable-itm-direct-tunnels}"
-          description: "Tunnel Configuration mode to be used in genius ifm config"
-      - string:
-          name: PUBLIC_PHYSICAL_NETWORK
-          default: "{public-physical-network}"
-          description: "provider physical network used for flat/vlan networks"
-      - string:
-          name: ENABLE_NETWORKING_L2GW
-          default: "{enable-networking-l2gw}"
-          description: "Enable networking L2gw"
-      - string:
-          name: NETWORKING_L2GW_DRIVER
-          default: "{networking-l2gw-repo}"
-          description: "URL to fetch networking-l2gw driver"
-      - string:
-          name: CREATE_INITIAL_NETWORKS
-          default: "{create-initial-networks}"
-          description: "Toggles the option of letting devstack create initial networks (True/False)"
-      - string:
-          name: LBAAS_SERVICE_PROVIDER
-          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."
-      - string:
-          name: GROUP_ADD_MOD_ENABLED
-          default: "{group-add-mod-enabled}"
-          description: "The Group add mod enabled mode to be configured - options are true/false."
-      - string:
-          name: OVS_INSTALL
-          default: "{ovs-install}"
-          description: |
-            Install a custom OVS. It can be an OVS version to build (like
-            v2.9.2 or v2.6.1-nsh) or a yum repo url to pull from.
-
 # Template: {project}-patch-test-{stream}
 # Goal: Build a patch and run project specific system test on a distribution containing the change
 # Operation: This job template builds a patch, creates a distribution containing the patch, and
           default: "all"
           description: "Specific feature test for patch"
       - maven-exec:
-          maven-version: mvn35
+          maven-version: "{mvn-version}"
 
     scm:
       - integration-gerrit-scm:
       - lf-update-java-alternatives:
           java-version: "{java-version}"
       - maven-target:
-          maven-version: mvn35
+          maven-version: "{mvn-version}"
           pom: "{project}/pom.xml"
           goals: |
             clean install dependency:tree
           global-settings: global-settings
           global-settings-type: cfp
       - maven-target:
-          maven-version: mvn35
+          maven-version: "{mvn-version}"
           pom: distribution/pom.xml
           goals: |
             clean install dependency:tree
           global-settings-type: cfp
       - integration-upload-distribution:
           dist-pom: distribution/pom.xml
+          settings-project: integration
       - trigger-builds:
           - project: "{csit-list}"
             block: true
       - email-notification:
           email-recipients: "{email-recipients}"
           email-prefix: "[{project}]"
+      - lf-infra-publish