X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fintegration%2Fintegration-templates.yaml;h=9e4c418ac63f11b1121c366bae0158382694def3;hb=160b2628128b60787d0bd66f61dd5d489ed90d28;hp=d776771b3b2845f981f5f8b8884d72256cfe53a3;hpb=2e5b6d78f0135f7c056f10c2f725970da2079f43;p=releng%2Fbuilder.git diff --git a/jjb/integration/integration-templates.yaml b/jjb/integration/integration-templates.yaml index d776771b3..9e4c418ac 100644 --- a/jjb/integration/integration-templates.yaml +++ b/jjb/integration/integration-templates.yaml @@ -78,10 +78,11 @@ openstack-heat-template-dir: openstack-hot odl_system_flavor: 'odl-highcpu-4' - odl_system_image: 'ZZCI - CentOS 7 - builder - x86_64 - 20181010-215635.956' - tools_system_count: 1 + 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-25 - 20181029-223449.514' + tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - 20190415-091034.881' ##################### # Job configuration # @@ -98,11 +99,13 @@ 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_count: '1' vm_0_flavor: '{odl_system_flavor}' vm_0_image: '{odl_system_image}' vm_1_count: '{tools_system_count}' @@ -184,10 +187,12 @@ openstack-heat-template-dir: openstack-hot odl_system_flavor: 'odl-highcpu-4' - odl_system_image: 'ZZCI - CentOS 7 - builder - x86_64 - 20181010-215635.956' - tools_system_count: 1 + 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-25 - 20181029-223449.514' + tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - 20190415-091034.881' + ##################### # Job configuration # @@ -203,12 +208,14 @@ repo-url: '{repo-url}' robot-options: '{robot-options}' # Controller - controller-scope: '{scope}' + 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_count: '1' vm_0_flavor: '{odl_system_flavor}' vm_0_image: '{odl_system_image}' vm_1_count: '{tools_system_count}' @@ -440,12 +447,14 @@ repo-url: '{repo-url}' robot-options: '{robot-options}' # Controller - controller-scope: '{scope}' + 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_count: '1' vm_0_flavor: '{odl_system_flavor}' vm_0_image: '{odl_system_image}' vm_1_count: '{tools_system_count}' @@ -482,7 +491,16 @@ # 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 # @@ -499,9 +517,18 @@ 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: @@ -536,14 +563,10 @@ 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' @@ -564,6 +587,8 @@ robot_other_files: '' robot-pass-threshold: 100.0 robot-unstable-threshold: 0.0 + - lf-stack-delete: + openstack-cloud: '{openstack-cloud}' - lf-infra-publish @@ -578,7 +603,16 @@ # 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 # @@ -594,10 +628,19 @@ repo-url: '{repo-url}' robot-options: '{robot-options}' # Controller - controller-scope: '{scope}' + 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: @@ -632,14 +675,10 @@ 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' @@ -801,6 +840,8 @@ 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: @@ -827,10 +868,19 @@ repo-url: '{repo-url}' robot-options: '{robot-options}' # Controller - controller-scope: '{scope}' + 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: @@ -862,7 +912,17 @@ # 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 # @@ -878,10 +938,19 @@ repo-url: '{repo-url}' robot-options: '{robot-options}' # Controller - controller-scope: '{scope}' + 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: @@ -909,14 +978,10 @@ 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' @@ -966,6 +1031,8 @@ robot_other_files: '' robot-pass-threshold: 100.0 robot-unstable-threshold: 0.0 + - lf-stack-delete: + openstack-cloud: '{openstack-cloud}' - lf-infra-publish @@ -980,7 +1047,23 @@ # 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 # @@ -997,9 +1080,24 @@ 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: @@ -1041,8 +1139,9 @@ - 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}' @@ -1118,8 +1217,9 @@ - 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}' @@ -1128,11 +1228,16 @@ 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: @@ -1145,20 +1250,10 @@ 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' @@ -1181,6 +1276,8 @@ - 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: @@ -1210,9 +1307,24 @@ 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: @@ -1341,6 +1453,10 @@ 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}' @@ -1359,7 +1475,23 @@ # 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 # @@ -1376,9 +1508,24 @@ 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: @@ -1511,6 +1658,10 @@ 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}' @@ -1528,20 +1679,10 @@ 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' @@ -1564,6 +1705,8 @@ - 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: @@ -1593,9 +1736,24 @@ 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: @@ -1728,6 +1886,10 @@ 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}' @@ -1797,6 +1959,8 @@ 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' @@ -1810,7 +1974,7 @@ {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 @@ -1826,7 +1990,7 @@ {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 @@ -1860,7 +2024,10 @@ # 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 # @@ -1877,9 +2044,21 @@ 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: @@ -1922,6 +2101,10 @@ 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: @@ -1934,17 +2117,10 @@ 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 @@ -1965,6 +2141,8 @@ - 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: @@ -1994,9 +2172,21 @@ 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: @@ -2039,3 +2229,7 @@ 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.'