Merge "Add Ubuntu 18.04 docker builder to ODL cloud"

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

diff --git a/jjb/integration/integration-templates.yaml b/jjb/integration/integration-templates.yaml
index 85e764a920da171cab42671bfd01d56c0fb8d638..e077c34aecd47d8b07865a08b4b4b5af2345a970 100644 (file)
--- a/jjb/integration/integration-templates.yaml
+++ b/jjb/integration/integration-templates.yaml
@@ -78,8 +78,9 @@
     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 - 20191201-060129.829'
+    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'
 
@@ -98,12 +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}'
@@ -185,8 +187,9 @@
     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 - 20191201-060129.829'
+    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'
 
@@ -206,12 +209,13 @@
           robot-options: '{robot-options}'
           # Controller
           controller-scope: '{scope}'
+          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}'
@@ -444,12 +448,13 @@
           robot-options: '{robot-options}'
           # Controller
           controller-scope: '{scope}'
+          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}'
@@ -491,8 +496,9 @@
     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 - 20191201-060129.829'
+    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'
 
@@ -511,12 +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}'
@@ -601,8 +608,9 @@
     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 - 20191201-060129.829'
+    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'
 
@@ -621,12 +629,13 @@
           robot-options: '{robot-options}'
           # Controller
           controller-scope: '{scope}'
+          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}'
@@ -860,12 +869,13 @@
           robot-options: '{robot-options}'
           # Controller
           controller-scope: '{scope}'
+          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}'
@@ -908,8 +918,9 @@
 
     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 - 20191201-060129.829'
+    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'
 
@@ -928,12 +939,13 @@
           robot-options: '{robot-options}'
           # Controller
           controller-scope: '{scope}'
+          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}'
@@ -1041,7 +1053,8 @@
 
     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 - 20191201-060129.829'
+    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'
@@ -1067,6 +1080,7 @@
           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}'
@@ -1286,6 +1300,7 @@
           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}'
@@ -1455,7 +1470,8 @@
 
     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 - 20191201-060129.829'
+    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'
@@ -1481,6 +1497,7 @@
           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}'
@@ -1704,6 +1721,7 @@
           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}'
@@ -1990,6 +2008,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 #
@@ -2006,6 +2025,7 @@
           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}'
@@ -2014,10 +2034,10 @@
           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:
@@ -2129,6 +2149,7 @@
           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}'
@@ -2137,10 +2158,10 @@
           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: