Update builder image to pull in Git version fix
[releng/builder.git] / jjb / integration / integration-templates.yaml
index c02b92d961366d1ab611d52f508afe6e71455e49..9e4c418ac63f11b1121c366bae0158382694def3 100644 (file)
@@ -40,6 +40,7 @@
     #####################
 
     build-days-to-keep: 30
+    build-timeout: 360  # Time in minutes
     disable-job: false
 
     #####################
@@ -55,6 +56,9 @@
       - opendaylight-infra-properties:
           build-days-to-keep: '{build-days-to-keep}'
 
+    wrappers:
+      - opendaylight-infra-wrappers:
+          build-timeout: '{build-timeout}'
 
 #################
 # Job Templates #
     id: inttest-csit-verify-1node
     <<: *inttest_csit_common
 
+    #####################
+    # Default variables #
+    #####################
+
+    openstack-cloud: vex
+    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 - 20200626-165329.838'
+    controller-max-mem: '2048m'
+    tools_system_count: '1'
+    tools_system_flavor: 'odl-highcpu-2'
+    tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - 20190415-091034.881'
+
+    #####################
+    # Job configuration #
+    #####################
+
     parameters:
-      - opendaylight-infra-parameters:
-          os-cloud: '{os-cloud}'
-          project: 'integration/test'
+      - integration-csit-parameters:
+          archive-artifacts: '{archive-artifacts}'
           branch: '{branch}'
-          refspec: 'refs/heads/{branch}'
-          artifacts: '{archive-artifacts}'
+          os-cloud: '{os-cloud}'
+          # CSIT
+          bundle-url: '{bundle-url}'
+          repo-url: '{repo-url}'
+          robot-options: '{robot-options}'
+          # Controller
+          controller-scope: only
+          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: '{verify-branch}'
       - integration-distribution-stream:
           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:
-          controller-features: '{install-features}'
-      - integration-test-options:
-          test-options: '{robot-options}'
       - integration-script-plan:
           script-plan: '{project}.txt'
       - integration-config-plan:
           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'
           refspec: '$GERRIT_REFSPEC'
           branch: 'master'
 
-    wrappers:
-      - opendaylight-infra-wrappers:
-          build-timeout: '{build-timeout}'
-
     triggers:
       - integration-trigger-patch-submitted:
           gerrit-server-name: '{gerrit-server-name}'
 
     builders:
       - lf-infra-pre-build
-      - 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-stack-2-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-cleanup-tmp
 
     publishers:
-      - integration-robot:
-          unstable-if: 0.0
-          pass-if: 100.0
       - email-notification:
           email-recipients: '{email-recipients}'
           email-prefix: '[{project}]'
-      - integration-csit-archive-build
-      - integration-csit-run-postscript
-      - releng-openstack-stack-delete
+      - integration-csit-publish:
+          robot_other_files: ''
+          robot-pass-threshold: 100.0
+          robot-unstable-threshold: 0.0
+      - lf-stack-delete:
+          openstack-cloud: '{openstack-cloud}'
       - lf-infra-publish
 
 
     # Default variables #
     #####################
 
-    # TODO: Add default variables here.
+    openstack-cloud: vex
+    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 - 20200626-165329.838'
+    controller-max-mem: '2048m'
+    tools_system_count: '1'
+    tools_system_flavor: 'odl-highcpu-2'
+    tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - 20190415-091034.881'
+
 
     #####################
     # Job configuration #
     #####################
 
     parameters:
-      - opendaylight-infra-parameters:
-          os-cloud: '{os-cloud}'
-          project: 'integration/test'
+      - integration-csit-parameters:
+          archive-artifacts: '{archive-artifacts}'
           branch: '{branch}'
-          refspec: 'refs/heads/{branch}'
-          artifacts: '{archive-artifacts}'
+          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-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-script-plan:
           script-plan: '{project}.txt'
       - integration-config-plan:
           jdkversion: '{jre}'
       - distribution-karaf-version:
           karaf-version: '{karaf-version}'
-      - integration-use-features-boot:
-          use-features-boot: 'True'
 
     scm:
       - integration-gerrit-scm:
       - integration-csit-trigger:
           jobs: '{trigger-jobs}'
 
-    wrappers:
-      - opendaylight-infra-wrappers:
-          build-timeout: '{build-timeout}'
-
     builders:
       - lf-infra-pre-build
-      - 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-stack-2-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-cleanup-tmp
 
     publishers:
-      - integration-robot:
-          unstable-if: 0.0
-          pass-if: 100.0
       - email-notification:
           email-recipients: '{email-recipients}'
           email-prefix: '[{project}]'
                 inclusion-flag: '{10-inclusion-flag}'
                 exclude: '{10-exclude-value}'
                 format: csv
-      - integration-csit-archive-build
-      - integration-csit-run-postscript
-      - releng-openstack-stack-delete
+      - integration-csit-publish:
+          robot_other_files: ''
+          robot-pass-threshold: 100.0
+          robot-unstable-threshold: 0.0
+      - lf-stack-delete:
+          openstack-cloud: '{openstack-cloud}'
       - lf-infra-publish
 
 - job-template:
     <<: *inttest_csit_1node
 
     parameters:
-      - opendaylight-infra-parameters:
-          os-cloud: '{os-cloud}'
-          project: 'integration/test'
+      - integration-csit-parameters:
+          archive-artifacts: '{archive-artifacts}'
           branch: '{branch}'
-          refspec: 'refs/heads/{branch}'
-          artifacts: '{archive-artifacts}'
+          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-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-script-plan:
           script-plan: '{project}.txt'
       - integration-config-plan:
           jdkversion: '{jre}'
       - distribution-karaf-version:
           karaf-version: '{karaf-version}'
-      - integration-use-features-boot:
-          use-features-boot: 'True'
 
 
 - job-template:
     # Default variables #
     #####################
 
-    # TODO: Add default variables here
+    openstack-cloud: vex
+    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 - 20200626-165329.838'
+    controller-max-mem: '2048m'
+    tools_system_count: '1'
+    tools_system_flavor: 'odl-highcpu-2'
+    tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - 20190415-091034.881'
 
     #####################
     # Job Configuration #
     #####################
 
     parameters:
-      - opendaylight-infra-parameters:
-          os-cloud: '{os-cloud}'
-          project: 'integration/test'
+      - integration-csit-parameters:
+          archive-artifacts: '{archive-artifacts}'
           branch: '{branch}'
-          refspec: 'refs/heads/{branch}'
-          artifacts: '{archive-artifacts}'
+          os-cloud: '{os-cloud}'
+          # CSIT
+          bundle-url: '{bundle-url}'
+          repo-url: '{repo-url}'
+          robot-options: '{robot-options}'
+          # Controller
+          controller-scope: only
+          controller-max-mem: '{controller-max-mem}'
+          debug-map: '{debug-map}'
+          install-features: 'odl-jolokia,{install-features}'
+          use-features-boot: 'True'
+          elasticsearch-attribute: '{elasticsearch-attribute}'
+      - integration-stack-2-type:
+          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}'
       - integration-distribution-branch:
           branch: '{verify-branch}'
       - integration-distribution-stream:
           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:
-          controller-features: 'odl-jolokia,{install-features}'
-      - integration-test-options:
-          test-options: '{robot-options}'
       - integration-script-plan:
           script-plan: '{project}.txt'
       - integration-config-plan:
           jdkversion: '{verify-jdkversion}'
       - distribution-karaf-version:
           karaf-version: '{verify-karaf-version}'
-      - integration-use-features-boot:
-          use-features-boot: 'True'
 
     scm:
       - integration-gerrit-scm:
           refspec: '$GERRIT_REFSPEC'
           branch: 'master'
 
-    wrappers:
-      - opendaylight-infra-wrappers:
-          build-timeout: '{build-timeout}'
-
     triggers:
       - integration-trigger-patch-submitted:
           gerrit-server-name: '{gerrit-server-name}'
 
     builders:
       - lf-infra-pre-build
-      - 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: '{tools_system_count}'
-          vm_1_flavor: '{tools_system_flavor}'
-          vm_1_image: '{tools_system_image}'
+      - integration-stack-2-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-cleanup-tmp
 
     publishers:
-      - integration-robot:
-          unstable-if: 0.0
-          pass-if: 100.0
       - email-notification:
           email-recipients: '{email-recipients}'
           email-prefix: '[{project}]'
-      - integration-csit-archive-build
-      - integration-csit-run-postscript
-      - releng-openstack-stack-delete
+      - integration-csit-publish:
+          robot_other_files: ''
+          robot-pass-threshold: 100.0
+          robot-unstable-threshold: 0.0
+      - lf-stack-delete:
+          openstack-cloud: '{openstack-cloud}'
       - lf-infra-publish
 
 
     # Default variables #
     #####################
 
-    # TODO: Add default variables here
+    openstack-cloud: vex
+    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 - 20200626-165329.838'
+    controller-max-mem: '2048m'
+    tools_system_count: '1'
+    tools_system_flavor: 'odl-highcpu-2'
+    tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - 20190415-091034.881'
 
     #####################
     # Job configuration #
     #####################
 
     parameters:
-      - opendaylight-infra-parameters:
-          os-cloud: '{os-cloud}'
-          project: 'integration/test'
+      - integration-csit-parameters:
+          archive-artifacts: '{archive-artifacts}'
           branch: '{branch}'
-          refspec: 'refs/heads/{branch}'
-          artifacts: '{archive-artifacts}'
+          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: 'odl-jolokia,{install-features}'
+          use-features-boot: 'True'
+          elasticsearch-attribute: '{elasticsearch-attribute}'
+      - integration-stack-2-type:
+          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}'
       - integration-distribution-branch:
           branch: '{branch}'
       - integration-distribution-stream:
           stream: '{stream}'
-      - integration-bundle-url:
-          bundle-url: '{bundle-url}'
-      - integration-repo-url:
-          repo-url: '{repo-url}'
-      - integration-controller-scope:
-          controller-scope: '{scope}'
-      - integration-controller-features:
-          controller-features: 'odl-jolokia,{install-features}'
-      - integration-controller-debug-map:
-          controller-debug-map: '{debug-map}'
-      - integration-test-options:
-          test-options: '{robot-options}'
       - integration-script-plan:
           script-plan: '{project}.txt'
       - integration-config-plan:
           jdkversion: '{jre}'
       - distribution-karaf-version:
           karaf-version: '{karaf-version}'
-      - integration-use-features-boot:
-          use-features-boot: 'True'
 
     scm:
       - integration-gerrit-scm:
       - integration-csit-trigger:
           jobs: '{trigger-jobs}'
 
-    wrappers:
-      - opendaylight-infra-wrappers:
-          build-timeout: '{build-timeout}'
-
     builders:
       - lf-infra-pre-build
-      - 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: '{tools_system_count}'
-          vm_1_flavor: '{tools_system_flavor}'
-          vm_1_image: '{tools_system_image}'
+      - integration-stack-2-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-cleanup-tmp
 
     publishers:
-      - integration-robot:
-          unstable-if: 0.0
-          pass-if: 100.0
       - email-notification:
           email-recipients: '{email-recipients}'
           email-prefix: '[{project}]'
                 inclusion-flag: '{10-inclusion-flag}'
                 exclude: '{10-exclude-value}'
                 format: csv
-      - integration-csit-archive-build
-      - integration-csit-run-postscript
-      - releng-openstack-stack-delete
+      - integration-csit-publish:
+          robot_other_files: ''
+          robot-pass-threshold: 100.0
+          robot-unstable-threshold: 0.0
+      - lf-stack-delete:
+          openstack-cloud: '{openstack-cloud}'
       - lf-infra-publish
 
 - job-template:
     <<: *inttest_csit_3node
 
     parameters:
-      - opendaylight-infra-parameters:
-          os-cloud: '{os-cloud}'
-          project: 'integration/test'
+      - integration-csit-parameters:
+          archive-artifacts: '{archive-artifacts}'
           branch: '{branch}'
-          refspec: 'refs/heads/{branch}'
-          artifacts: '{archive-artifacts}'
+          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: 'odl-jolokia,{install-features}'
+          use-features-boot: 'True'
+          elasticsearch-attribute: '{elasticsearch-attribute}'
+      - integration-stack-2-type:
+          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}'
       - integration-distribution-branch:
           branch: '{branch}'
       - integration-distribution-stream:
           stream: '{stream}'
-      - integration-bundle-url:
-          bundle-url: '{bundle-url}'
-      - integration-repo-url:
-          repo-url: '{repo-url}'
-      - integration-controller-scope:
-          controller-scope: '{scope}'
-      - integration-controller-features:
-          controller-features: 'odl-jolokia,{install-features}'
-      - integration-controller-debug-map:
-          controller-debug-map: '{debug-map}'
-      - integration-test-options:
-          test-options: '{robot-options}'
       - integration-script-plan:
           script-plan: '{project}.txt'
       - integration-config-plan:
           jdkversion: '{jre}'
       - distribution-karaf-version:
           karaf-version: '{karaf-version}'
-      - integration-use-features-boot:
-          use-features-boot: 'True'
 
 
 - job-template:
     # Default variables #
     #####################
 
-    # TODO: Add default variables here
+    openstack-cloud: vex
+    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 - 20200626-165329.838'
+    controller-max-mem: '2048m'
+    docker_system_count: '1'
+    docker_system_flavor: 'odl-standard-1'
+    docker_system_image: 'ZZCI - CentOS 7 - docker - x86_64 - 20191004-045622.840'
 
     #####################
     # Job Configuration #
     #####################
 
     parameters:
-      - opendaylight-infra-parameters:
-          os-cloud: '{os-cloud}'
-          project: 'integration/test'
+      - integration-csit-parameters:
+          archive-artifacts: '{archive-artifacts}'
           branch: '{branch}'
-          refspec: 'refs/heads/{branch}'
-          artifacts: '{archive-artifacts}'
+          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: 'odl-jolokia,{install-features}'
+          use-features-boot: 'True'
+          elasticsearch-attribute: '{elasticsearch-attribute}'
+      - integration-stack-2-type:
+          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-distribution-branch:
           branch: '{branch}'
       - integration-distribution-stream:
           stream: '{stream}'
-      - integration-bundle-url:
-          bundle-url: '{bundle-url}'
-      - integration-repo-url:
-          repo-url: '{repo-url}'
-      - integration-controller-scope:
-          controller-scope: '{scope}'
-      - integration-controller-features:
-          controller-features: 'odl-jolokia,{install-features}'
-      - integration-test-options:
-          test-options: '{robot-options}'
       - integration-script-plan:
           script-plan: '{project}.txt'
       - integration-config-plan:
           jdkversion: '{jre}'
       - distribution-karaf-version:
           karaf-version: '{karaf-version}'
-      - integration-use-features-boot:
-          use-features-boot: 'True'
 
     scm:
       - integration-gerrit-scm:
           refspec: '$PATCHREFSPEC'
           branch: 'master'
 
-    wrappers:
-      - opendaylight-infra-wrappers:
-          build-timeout: '{build-timeout}'
-
     builders:
       - lf-infra-pre-build
-      - 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-stack-2-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-cleanup-tmp
 
     publishers:
-      - integration-robot:
-          unstable-if: 0.0
-          pass-if: 100.0
       - email-notification:
           email-recipients: '{email-recipients}'
           email-prefix: '[{project}]'
                 inclusion-flag: 'off'
                 display-table: true
                 format: csv
-      - integration-csit-archive-build
-      - integration-csit-run-postscript
-      - releng-openstack-stack-delete
+      - integration-csit-publish:
+          robot_other_files: ''
+          robot-pass-threshold: 100.0
+          robot-unstable-threshold: 0.0
+      - lf-stack-delete:
+          openstack-cloud: '{openstack-cloud}'
       - lf-infra-publish
 
 
     # Default variables #
     #####################
 
-    # TODO: Add default variables here
+    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 - 20200626-165329.838'
+    controller-max-mem: '2048m'
+    openstack_system_count: 1
+    openstack_system_flavor: 'odl-standard-4'
+    openstack_system_image: 'ZZCI - CentOS 7 - devstack - x86_64 - 20191004-045548.485'
+    openstack_system2_count: 0
+    openstack_system2_flavor: 'odl-standard-1'
+    openstack_system2_image: 'ZZCI - CentOS 7 - devstack - x86_64 - 20191004-045548.485'
+    tools_system_count: 1
+    tools_system_flavor: 'odl-highcpu-2'
+    tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - 20190415-091034.881'
 
     #####################
     # Job configuration #
     #####################
 
     parameters:
-      - opendaylight-infra-parameters:
-          os-cloud: '{os-cloud}'
-          project: 'integration/test'
+      - integration-csit-parameters:
+          archive-artifacts: '{archive-artifacts}'
           branch: '{branch}'
-          refspec: 'refs/heads/{branch}'
-          artifacts: '{archive-artifacts}'
+          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-bundle-url:
-          bundle-url: '{bundle-url}'
-      - integration-repo-url:
-          repo-url: '{repo-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-script-plan:
           script-plan: '{project}.txt'
       - integration-config-plan:
           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}'
       - 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)'
+          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}'
       - 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'
+          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}'
           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.'
+          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:
           refspec: '$PATCHREFSPEC'
           branch: 'master'
 
-    wrappers:
-      - opendaylight-infra-wrappers:
-          build-timeout: '{build-timeout}'
-
     triggers:
       - timed: '{schedule}'
 
     builders:
       - lf-infra-pre-build
-      - 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: '{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-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-cleanup-tmp
 
     publishers:
-      - integration-robot-tempest:
-          unstable-if: 0.0
-          pass-if: 100.0
       - 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
+      - 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:
     <<: *inttest_csit_hwvtep_openstack
 
     parameters:
-      - opendaylight-infra-parameters:
-          os-cloud: '{os-cloud}'
-          project: 'integration/test'
+      - integration-csit-parameters:
+          archive-artifacts: '{archive-artifacts}'
           branch: '{branch}'
-          refspec: 'refs/heads/{branch}'
-          artifacts: '{archive-artifacts}'
+          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-bundle-url:
-          bundle-url: '{bundle-url}'
-      - integration-repo-url:
-          repo-url: '{repo-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-script-plan:
           script-plan: '{project}.txt'
       - integration-config-plan:
           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}'
           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}'
     # Default variables #
     #####################
 
-    # TODO: Add default variables here
+    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 - 20200626-165329.838'
+    controller-max-mem: '2048m'
+    openstack_system_count: 1
+    openstack_system_flavor: 'odl-standard-4'
+    openstack_system_image: 'ZZCI - CentOS 7 - devstack - x86_64 - 20191004-045548.485'
+    openstack_system2_count: 0
+    openstack_system2_flavor: 'odl-standard-1'
+    openstack_system2_image: 'ZZCI - CentOS 7 - devstack - x86_64 - 20191004-045548.485'
+    tools_system_count: 1
+    tools_system_flavor: 'odl-highcpu-2'
+    tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - 20190415-091034.881'
 
     #####################
     # Job configuration #
     #####################
 
     parameters:
-      - opendaylight-infra-parameters:
-          os-cloud: '{os-cloud}'
-          project: 'integration/test'
+      - integration-csit-parameters:
+          archive-artifacts: '{archive-artifacts}'
           branch: '{branch}'
-          refspec: 'refs/heads/{branch}'
-          artifacts: '{archive-artifacts}'
+          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-bundle-url:
-          bundle-url: '{bundle-url}'
-      - integration-repo-url:
-          repo-url: '{repo-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-script-plan:
           script-plan: '{project}.txt'
       - integration-config-plan:
           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}'
           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}'
           refspec: '$PATCHREFSPEC'
           branch: 'master'
 
-    wrappers:
-      - opendaylight-infra-wrappers:
-          build-timeout: '{build-timeout}'
-
     triggers:
       - timed: '{schedule}'
 
     builders:
       - lf-infra-pre-build
-      - 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: '{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-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-cleanup-tmp
 
     publishers:
-      - integration-robot-tempest:
-          unstable-if: 0.0
-          pass-if: 100.0
       - 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
+      - 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:
     <<: *inttest_csit_openstack
 
     parameters:
-      - opendaylight-infra-parameters:
-          os-cloud: '{os-cloud}'
-          project: 'integration/test'
+      - integration-csit-parameters:
+          archive-artifacts: '{archive-artifacts}'
           branch: '{branch}'
-          refspec: 'refs/heads/{branch}'
-          artifacts: '{archive-artifacts}'
+          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-bundle-url:
-          bundle-url: '{bundle-url}'
-      - integration-repo-url:
-          repo-url: '{repo-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-script-plan:
           script-plan: '{project}.txt'
       - integration-config-plan:
           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}'
           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}'
     id: inttest-patch-test
     <<: *inttest_csit_common
 
+    build-timeout: 720
+
     parameters:
       - opendaylight-infra-parameters:
           os-cloud: '{os-cloud}'
       - integration-distribution-scm:
           branch: '{branch}'
 
-    wrappers:
-      - opendaylight-infra-wrappers:
-          build-timeout: '{build-timeout}'
-
     triggers:
       - gerrit:
           server-name: '{gerrit-server-name}'
     builders:
       - integration-rebase-gerrit-patch
       - wipe-org-opendaylight-repo
+      - lf-update-java-alternatives:
+          java-version: '{java-version}'
       - maven-target:
           maven-version: mvn35
           pom: '{project}/pom.xml'
               {opendaylight-infra-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'
+            - '-Xmx4096m -Dmaven.compile.fork=true'
           settings: integration-settings
           settings-type: cfp
           global-settings: global-settings
               {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'
+            - '-Xmx1024m -Dmaven.compile.fork=true'
           settings: integration-settings
           settings-type: cfp
           global-settings: global-settings
             predefined-parameters: |
               BUNDLE_URL=$BUNDLE_URL
               GERRIT_BRANCH=$GERRIT_BRANCH
+              GERRIT_PROJECT=$GERRIT_PROJECT
               GERRIT_REFSPEC=$GERRIT_REFSPEC
               KARAF_VERSION=$KARAF_VERSION
 
     # Default variables #
     #####################
 
-    # TODO: Add default variables here
+    openstack-cloud: vex
+    openstack-heat-template: csit-apex-3-instance-type.yaml
+    openstack-heat-template-dir: openstack-hot
+    controller-max-mem: '2048m'
 
     #####################
     # Job configuration #
     #####################
 
     parameters:
-      - opendaylight-infra-parameters:
-          os-cloud: '{os-cloud}'
-          project: 'integration/test'
+      - integration-csit-parameters:
+          archive-artifacts: '{archive-artifacts}'
           branch: '{branch}'
-          refspec: 'refs/heads/{branch}'
-          artifacts: '{archive-artifacts}'
+          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-3-type:
+          vm_0_count: '{apex_controller_count}'
+          vm_0_flavor: '{apex_controller_flavor}'
+          vm_0_image: '{apex_controller_image}'
+          vm_1_count: '1'
+          vm_1_flavor: '{apex_compute_0_flavor}'
+          vm_1_image: '{apex_compute_0_image}'
+          vm_2_count: '1'
+          vm_2_flavor: '{apex_compute_1_flavor}'
+          vm_2_image: '{apex_compute_1_image}'
       - integration-distribution-branch:
           branch: '{branch}'
       - integration-distribution-stream:
           stream: '{stream}'
-      - integration-bundle-url:
-          bundle-url: '{bundle-url}'
-      - integration-repo-url:
-          repo-url: '{repo-url}'
-      - integration-controller-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: '{project}-{functionality}.txt'
       - integration-test-suites:
           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}'
           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.'
 
     scm:
       - integration-gerrit-scm:
           refspec: '$PATCHREFSPEC'
           branch: 'master'
 
-    wrappers:
-      - opendaylight-infra-wrappers:
-          build-timeout: '{build-timeout}'
-
     triggers:
       - timed: '{schedule}'
 
     builders:
       - lf-infra-pre-build
-      - integration-apex-stack-3-type:
-          stack-template: '{stack-template}'
-          vm_0_count: '{apex_controller_count}'
-          vm_0_flavor: '{apex_controller_flavor}'
-          vm_0_image: '{apex_controller_image}'
-          vm_1_count: '1'
-          vm_1_flavor: '{apex_compute_0_flavor}'
-          vm_1_image: '{apex_compute_0_image}'
-          vm_2_count: '1'
-          vm_2_flavor: '{apex_compute_1_flavor}'
-          vm_2_image: '{apex_compute_1_image}'
+      - integration-stack-3-type:
+          openstack-cloud: '{openstack-cloud}'
+          openstack-heat-template: '{openstack-heat-template}'
+          openstack-heat-template-dir: '{openstack-heat-template-dir}'
       - integration-install-robotframework
       - integration-detect-variables
       - integration-install-common-functions
       - integration-cleanup-tmp
 
     publishers:
-      - integration-robot-tempest:
-          unstable-if: 0.0
-          pass-if: 100.0
       - email-notification:
           email-recipients: '{email-recipients}'
           email-prefix: '[{project}]'
-      - integration-csit-archive-build
-      - integration-csit-run-postscript
-      - releng-openstack-stack-delete
+      - 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:
     <<: *inttest_csit_apex
 
     parameters:
-      - opendaylight-infra-parameters:
-          os-cloud: '{os-cloud}'
-          project: 'integration/test'
+      - integration-csit-parameters:
+          archive-artifacts: '{archive-artifacts}'
           branch: '{branch}'
-          refspec: 'refs/heads/{branch}'
-          artifacts: '{archive-artifacts}'
+          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-3-type:
+          vm_0_count: '{apex_controller_count}'
+          vm_0_flavor: '{apex_controller_flavor}'
+          vm_0_image: '{apex_controller_image}'
+          vm_1_count: '1'
+          vm_1_flavor: '{apex_compute_0_flavor}'
+          vm_1_image: '{apex_compute_0_image}'
+          vm_2_count: '1'
+          vm_2_flavor: '{apex_compute_1_flavor}'
+          vm_2_image: '{apex_compute_1_image}'
       - integration-distribution-branch:
           branch: '{branch}'
       - integration-distribution-stream:
           stream: '{stream}'
-      - integration-bundle-url:
-          bundle-url: '{bundle-url}'
-      - integration-repo-url:
-          repo-url: '{repo-url}'
-      - integration-controller-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:
           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}'
           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.'