X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=jjb%2Fintegration%2Fintegration-templates.yaml;h=8bc06a78213efd016385d32f0ef2917b665fed61;hb=cf656f63255c72362c5c3ca0106f49d3e84f3660;hp=77b2dae6143ba889f9d0806ca4cee6fbb6772c2a;hpb=b5a16be5c91f0971e492c20b389057ac29526789;p=releng%2Fbuilder.git

diff --git a/jjb/integration/integration-templates.yaml b/jjb/integration/integration-templates.yaml
index 77b2dae61..8bc06a782 100644
--- a/jjb/integration/integration-templates.yaml
+++ b/jjb/integration/integration-templates.yaml
@@ -76,13 +76,6 @@
     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 - 20200730-200731.474"
-    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 #
     #####################
@@ -103,6 +96,8 @@
           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}"
@@ -124,8 +119,6 @@
           test-plan: "{project}-{functionality}.txt"
       - integration-jdk-version:
           jdkversion: "{verify-jdkversion}"
-      - distribution-karaf-version:
-          karaf-version: "{verify-karaf-version}"
 
     scm:
       - integration-gerrit-scm:
@@ -184,13 +177,6 @@
     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 - 20200730-200731.474"
-    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 #
     #####################
@@ -211,6 +197,8 @@
           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}"
@@ -236,8 +224,6 @@
           branch: "master"
       - integration-jdk-version:
           jdkversion: "{jre}"
-      - distribution-karaf-version:
-          karaf-version: "{karaf-version}"
 
     scm:
       - integration-gerrit-scm:
@@ -265,6 +251,7 @@
       - integration-detect-variables
       - integration-install-common-functions
       - integration-deploy-controller-run-test
+      - integration-run-test
       - integration-cleanup-tmp
 
     publishers:
@@ -450,6 +437,8 @@
           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}"
@@ -475,8 +464,6 @@
           branch: "master"
       - integration-jdk-version:
           jdkversion: "{jre}"
-      - distribution-karaf-version:
-          karaf-version: "{karaf-version}"
 
 - job-template:
     name: "{prefix}{project}-csit-verify-3node-{functionality}"
@@ -491,13 +478,6 @@
     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 - 20200730-200731.474"
-    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 #
     #####################
@@ -518,6 +498,8 @@
           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}"
@@ -541,8 +523,6 @@
           test-suites: "{test-suites}"
       - integration-jdk-version:
           jdkversion: "{verify-jdkversion}"
-      - distribution-karaf-version:
-          karaf-version: "{verify-karaf-version}"
 
     scm:
       - integration-gerrit-scm:
@@ -602,13 +582,6 @@
     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 - 20200730-200731.474"
-    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 #
     #####################
@@ -629,6 +602,8 @@
           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}"
@@ -654,8 +629,6 @@
           branch: "master"
       - integration-jdk-version:
           jdkversion: "{jre}"
-      - distribution-karaf-version:
-          karaf-version: "{karaf-version}"
 
     scm:
       - integration-gerrit-scm:
@@ -869,6 +842,8 @@
           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}"
@@ -894,8 +869,6 @@
           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}"
@@ -910,13 +883,9 @@
     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 - 20200730-200731.474"
-    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"
+    docker_system_flavor: "v3-standard-2"
+    docker_system_image: "ZZCI - CentOS 7 - docker - x86_64 - 20220401-220102.840"
 
     #####################
     # Job Configuration #
@@ -938,6 +907,8 @@
           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}"
@@ -961,8 +932,6 @@
           branch: "master"
       - integration-jdk-version:
           jdkversion: "{jre}"
-      - distribution-karaf-version:
-          karaf-version: "{karaf-version}"
 
     scm:
       - integration-gerrit-scm:
@@ -1044,20 +1013,6 @@
     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 - 20200730-200731.474"
-    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 #
     #####################
@@ -1078,6 +1033,8 @@
           install-features: "{install-features}"
           use-features-boot: "{use-features-boot}"
           elasticsearch-attribute: "{elasticsearch-attribute}"
+          karaf-based-controller: "{karaf-based-controller}"
+          karaf-version: "{karaf-version}"
       - integration-stack-4-type:
           vm_0_count: "{odl_system_count}"
           vm_0_flavor: "{odl_system_flavor}"
@@ -1107,8 +1064,6 @@
           branch: "master"
       - integration-jdk-version:
           jdkversion: "{jre}"
-      - distribution-karaf-version:
-          karaf-version: "{karaf-version}"
       - string:
           name: OPENSTACK_BRANCH
           default: "{openstack-branch}"
@@ -1305,6 +1260,8 @@
           install-features: "{install-features}"
           use-features-boot: "{use-features-boot}"
           elasticsearch-attribute: "{elasticsearch-attribute}"
+          karaf-based-controller: "{karaf-based-controller}"
+          karaf-version: "{karaf-version}"
       - integration-stack-4-type:
           vm_0_count: "{odl_system_count}"
           vm_0_flavor: "{odl_system_flavor}"
@@ -1334,8 +1291,6 @@
           branch: "master"
       - integration-jdk-version:
           jdkversion: "{jre}"
-      - distribution-karaf-version:
-          karaf-version: "{karaf-version}"
       - string:
           name: OPENSTACK_BRANCH
           default: "{openstack-branch}"
@@ -1474,20 +1429,6 @@
     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 - 20200730-200731.474"
-    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 #
     #####################
@@ -1508,6 +1449,8 @@
           install-features: "{install-features}"
           use-features-boot: "{use-features-boot}"
           elasticsearch-attribute: "{elasticsearch-attribute}"
+          karaf-based-controller: "{karaf-based-controller}"
+          karaf-version: "{karaf-version}"
       - integration-stack-4-type:
           vm_0_count: "{odl_system_count}"
           vm_0_flavor: "{odl_system_flavor}"
@@ -1537,8 +1480,6 @@
           branch: "master"
       - integration-jdk-version:
           jdkversion: "{jre}"
-      - distribution-karaf-version:
-          karaf-version: "{karaf-version}"
       - string:
           name: OPENSTACK_BRANCH
           default: "{openstack-branch}"
@@ -1739,6 +1680,8 @@
           install-features: "{install-features}"
           use-features-boot: "{use-features-boot}"
           elasticsearch-attribute: "{elasticsearch-attribute}"
+          karaf-based-controller: "{karaf-based-controller}"
+          karaf-version: "{karaf-version}"
       - integration-stack-4-type:
           vm_0_count: "{odl_system_count}"
           vm_0_flavor: "{odl_system_flavor}"
@@ -1768,8 +1711,6 @@
           branch: "master"
       - integration-jdk-version:
           jdkversion: "{jre}"
-      - distribution-karaf-version:
-          karaf-version: "{karaf-version}"
       - string:
           name: OPENSTACK_BRANCH
           default: "{openstack-branch}"
@@ -1897,14 +1838,14 @@
             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
-# triggers the project system test defined in {csit-list} when gerrit receives test-{project} keyword
+# 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:
-    name: "{prefix}{project}-patch-test-{feature}-{stream}"
-    id: inttest-patch-test
+    name: "{prefix}{project}-mri-patch-test-{feature}-{stream}"
+    id: inttest-mri-patch-test
     <<: *inttest_csit_common
 
     build-timeout: 720
@@ -1927,7 +1868,7 @@
           default: "all"
           description: "Specific feature test for patch"
       - maven-exec:
-          maven-version: mvn35
+          maven-version: "{mvn-version}"
 
     scm:
       - integration-gerrit-scm:
@@ -1963,7 +1904,7 @@
       - 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
@@ -1980,24 +1921,9 @@
           settings-type: cfp
           global-settings: global-settings
           global-settings-type: cfp
-      - maven-target:
-          maven-version: mvn35
-          pom: distribution/pom.xml
-          goals: |
-            clean install dependency:tree
-            -Pq
-            -Dgitid.skip=false
-            -Dmaven.gitcommitid.skip=false
-            {opendaylight-infra-mvn-opts}
-          # {opendaylight-infra-parallel-mvn-opts} is bad when there are multiple big features in SFT.
-          java-opts:
-            - "-Xmx1024m -Dmaven.compile.fork=true"
-          settings: integration-settings
-          settings-type: cfp
-          global-settings: global-settings
-          global-settings-type: cfp
       - integration-upload-distribution:
-          dist-pom: distribution/pom.xml
+          dist-pom: "{project}/pom.xml"
+          settings-project: "{project}"
       - trigger-builds:
           - project: "{csit-list}"
             block: true
@@ -2012,224 +1938,122 @@
       - email-notification:
           email-recipients: "{email-recipients}"
           email-prefix: "[{project}]"
+      - lf-infra-publish
 
-#####################
-# inttest-csit-apex #
-#####################
-
-- inttest_csit_apex: &inttest_csit_apex
-    name: inttest-csit-apex
-
-    #####################
-    # Default variables #
-    #####################
+# 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
+# triggers the project system test defined in {csit-list} when gerrit receives test-{project} keyword
 
-    openstack-cloud: vex
-    openstack-heat-template: csit-apex-3-instance-type.yaml
-    openstack-heat-template-dir: openstack-hot
-    controller-max-mem: "2048m"
+- job-template:
+    name: "{prefix}{project}-patch-test-{feature}-{stream}"
+    id: inttest-patch-test
+    <<: *inttest_csit_common
 
-    #####################
-    # Job configuration #
-    #####################
+    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-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}"
+          project: "{project}"
+          branch: "{branch}"
+          refspec: "refs/heads/{branch}"
+          artifacts: "{archive-artifacts}"
       - integration-distribution-branch:
           branch: "{branch}"
-      - integration-distribution-stream:
-          stream: "{stream}"
-      - 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: 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: 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: 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."
+          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-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
-      - inject:
-          properties-file: "env.properties"
-      - integration-get-apex-addresses
-      - inject:
-          properties-file: "slave_addresses.txt"
-      - integration-apex-run-tests
-      - 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
+      - maven-target:
+          maven-version: "{mvn-version}"
+          pom: distribution/pom.xml
+          goals: |
+            clean install dependency:tree
+            -Pq
+            -Dgitid.skip=false
+            -Dmaven.gitcommitid.skip=false
+            {opendaylight-infra-mvn-opts}
+          # {opendaylight-infra-parallel-mvn-opts} is bad when there are multiple big features in SFT.
+          java-opts:
+            - "-Xmx1024m -Dmaven.compile.fork=true"
+          settings: integration-settings
+          settings-type: cfp
+          global-settings: global-settings
+          global-settings-type: cfp
+      - integration-upload-distribution:
+          dist-pom: distribution/pom.xml
+          settings-project: integration
+      - 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-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-apex-{openstack}-{functionality}-{stream}"
-    id: inttest-csit-apex
-    <<: *inttest_csit_common
-    # yamllint disable-line rule:key-duplicates
-    <<: *inttest_csit_apex
-
-- 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-apex-{openstack}-{functionality}-{stream}"
-    id: inttest-csit-apex-custom
-    <<: *inttest_csit_common
-    # yamllint disable-line rule:key-duplicates
-    <<: *inttest_csit_apex
-
-    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-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-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: 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: 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: 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."