Merge "Move unimgr Sonar scan to Sonarcloud"

[releng/builder.git] / jjb / integration / integration-templates.yaml

diff --git a/jjb/integration/integration-templates.yaml b/jjb/integration/integration-templates.yaml
index d4520c9ecc1aa06a76f4433848a89c74818dd31e..e6f512f75f4ff415a5baebb65183ead866b9bf61 100644 (file)
--- 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 - 20190924-232354.381'
-    tools_system_count: 1
+    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-25 - 20190416-121328.240'
+    tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - x86_64 - 20200801-220238.229'
 
     #####################
     # 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 - 20190924-232354.381'
-    tools_system_count: 1
+    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-25 - 20190416-121328.240'
+    tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - x86_64 - 20200801-220238.229'
+
 
     #####################
     # 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}'
@@ -487,10 +496,11 @@
     openstack-heat-template-dir: openstack-hot
 
     odl_system_flavor: 'odl-highcpu-4'
-    odl_system_image: 'ZZCI - CentOS 7 - builder - x86_64 - 20190924-232354.381'
-    tools_system_count: 1
+    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-25 - 20190416-121328.240'
+    tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - x86_64 - 20200801-220238.229'
 
     #####################
     # Job Configuration #
@@ -507,11 +517,13 @@
           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_count: '3'
           vm_0_flavor: '{odl_system_flavor}'
           vm_0_image: '{odl_system_image}'
           vm_1_count: '{tools_system_count}'
@@ -596,10 +608,11 @@
     openstack-heat-template-dir: openstack-hot
 
     odl_system_flavor: 'odl-highcpu-4'
-    odl_system_image: 'ZZCI - CentOS 7 - builder - x86_64 - 20190924-232354.381'
-    tools_system_count: 1
+    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-25 - 20190416-121328.240'
+    tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - x86_64 - 20200801-220238.229'
 
     #####################
     # Job configuration #
@@ -615,12 +628,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: 'odl-jolokia,{install-features}'
           use-features-boot: 'True'
+          elasticsearch-attribute: '{elasticsearch-attribute}'
       - integration-stack-2-type:
-          vm_0_count: 3
+          vm_0_count: '3'
           vm_0_flavor: '{odl_system_flavor}'
           vm_0_image: '{odl_system_image}'
           vm_1_count: '{tools_system_count}'
@@ -853,12 +868,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: 'odl-jolokia,{install-features}'
           use-features-boot: 'True'
+          elasticsearch-attribute: '{elasticsearch-attribute}'
       - integration-stack-2-type:
-          vm_0_count: 3
+          vm_0_count: '3'
           vm_0_flavor: '{odl_system_flavor}'
           vm_0_image: '{odl_system_image}'
           vm_1_count: '{tools_system_count}'
@@ -901,10 +918,11 @@
 
     odl_system_count: 1
     odl_system_flavor: 'odl-highcpu-4'
-    odl_system_image: 'ZZCI - CentOS 7 - builder - x86_64 - 20190924-232354.381'
-    docker_system_count: 1
+    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 - 20180723-235456.035'
+    docker_system_image: 'ZZCI - CentOS 7 - docker - x86_64 - 20200801-220136.401'
 
     #####################
     # Job Configuration #
@@ -920,12 +938,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: 'odl-jolokia,{install-features}'
           use-features-boot: 'True'
+          elasticsearch-attribute: '{elasticsearch-attribute}'
       - integration-stack-2-type:
-          vm_0_count: 3
+          vm_0_count: '3'
           vm_0_flavor: '{odl_system_flavor}'
           vm_0_image: '{odl_system_image}'
           vm_1_count: '{docker_system_count}'
@@ -1033,16 +1053,17 @@
 
     odl_system_count: 1
     odl_system_flavor: 'odl-highcpu-4'
-    odl_system_image: 'ZZCI - CentOS 7 - builder - x86_64 - 20190924-232354.381'
+    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_system_image: 'ZZCI - CentOS 7 - devstack - x86_64 - 20200801-230142.896'
     openstack_system2_count: 0
     openstack_system2_flavor: 'odl-standard-1'
-    openstack_system2_image: 'ZZCI - CentOS 7 - devstack - x86_64 - 20191004-045548.485'
+    openstack_system2_image: 'ZZCI - CentOS 7 - devstack - x86_64 - 20200801-230142.896'
     tools_system_count: 1
     tools_system_flavor: 'odl-highcpu-2'
-    tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-25 - 20190416-121328.240'
+    tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - x86_64 - 20200801-220238.229'
 
     #####################
     # Job configuration #
@@ -1059,9 +1080,11 @@
           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}'
@@ -1116,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}'
@@ -1193,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}'
@@ -1203,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:
@@ -1277,9 +1307,11 @@
           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}'
@@ -1421,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}'
@@ -1445,16 +1481,17 @@
 
     odl_system_count: 1
     odl_system_flavor: 'odl-highcpu-4'
-    odl_system_image: 'ZZCI - CentOS 7 - builder - x86_64 - 20190924-232354.381'
+    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_system_image: 'ZZCI - CentOS 7 - devstack - x86_64 - 20200801-230142.896'
     openstack_system2_count: 0
     openstack_system2_flavor: 'odl-standard-1'
-    openstack_system2_image: 'ZZCI - CentOS 7 - devstack - x86_64 - 20191004-045548.485'
+    openstack_system2_image: 'ZZCI - CentOS 7 - devstack - x86_64 - 20200801-230142.896'
     tools_system_count: 1
     tools_system_flavor: 'odl-highcpu-2'
-    tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-25 - 20190416-121328.240'
+    tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - x86_64 - 20200801-220238.229'
 
     #####################
     # Job configuration #
@@ -1471,9 +1508,11 @@
           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}'
@@ -1619,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}'
@@ -1693,9 +1736,11 @@
           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}'
@@ -1841,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}'
@@ -1978,6 +2027,7 @@
     openstack-cloud: vex
     openstack-heat-template: csit-apex-3-instance-type.yaml
     openstack-heat-template-dir: openstack-hot
+    controller-max-mem: '2048m'
 
     #####################
     # Job configuration #
@@ -1994,17 +2044,19 @@
           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_count: '1'
           vm_1_flavor: '{apex_compute_0_flavor}'
           vm_1_image: '{apex_compute_0_image}'
-          vm_2_count: 1
+          vm_2_count: '1'
           vm_2_flavor: '{apex_compute_1_flavor}'
           vm_2_image: '{apex_compute_1_image}'
       - integration-distribution-branch:
@@ -2049,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:
@@ -2116,17 +2172,19 @@
           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_count: '1'
           vm_1_flavor: '{apex_compute_0_flavor}'
           vm_1_image: '{apex_compute_0_image}'
-          vm_2_count: 1
+          vm_2_count: '1'
           vm_2_flavor: '{apex_compute_1_flavor}'
           vm_2_image: '{apex_compute_1_image}'
       - integration-distribution-branch:
@@ -2171,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.'