Quote param values to force them to be strings

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

diff --git a/jjb/integration/integration-templates.yaml b/jjb/integration/integration-templates.yaml
index c7f1d45076718af2fce7966a6ef53509bf891601..6ae692419733cc233d3a8b3dcbd5dd07ab3ed016 100644 (file)
--- a/jjb/integration/integration-templates.yaml
+++ b/jjb/integration/integration-templates.yaml
@@ -78,10 +78,10 @@
     openstack-heat-template-dir: openstack-hot
 
     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'
     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 - 20190415-091034.881'
 
     #####################
     # Job configuration #
@@ -101,8 +101,9 @@
           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 +185,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'
+    odl_system_image: 'ZZCI - CentOS 7 - builder - x86_64 - 20191201-060129.829'
     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 - 20190415-091034.881'
+
 
     #####################
     # Job configuration #
@@ -207,8 +209,9 @@
           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,8 +447,9 @@
           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 +491,10 @@
     openstack-heat-template-dir: openstack-hot
 
     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'
     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 - 20190415-091034.881'
 
     #####################
     # Job Configuration #
@@ -510,8 +514,9 @@
           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 +601,10 @@
     openstack-heat-template-dir: openstack-hot
 
     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'
     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 - 20190415-091034.881'
 
     #####################
     # Job configuration #
@@ -619,8 +624,9 @@
           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}'
@@ -857,8 +863,9 @@
           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,7 +908,7 @@
 
     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'
     docker_system_count: 1
     docker_system_flavor: 'odl-standard-1'
     docker_system_image: 'ZZCI - CentOS 7 - docker - x86_64 - 20191004-045622.840'
@@ -924,8 +931,9 @@
           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 +1041,16 @@
 
     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'
     openstack_system_count: 1
     openstack_system_flavor: 'odl-standard-4'
-    openstack_system_image: 'ZZCI - CentOS 7 - devstack - 20180911-204116.460'
+    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 - 20180911-204116.460'
+    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-25 - 20190416-121328.240'
+    tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - 20190415-091034.881'
 
     #####################
     # Job configuration #
@@ -1062,6 +1070,7 @@
           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}'
@@ -1280,6 +1289,7 @@
           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}'
@@ -1445,16 +1455,16 @@
 
     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'
     openstack_system_count: 1
     openstack_system_flavor: 'odl-standard-4'
-    openstack_system_image: 'ZZCI - CentOS 7 - devstack - 20180911-204116.460'
+    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 - 20180911-204116.460'
+    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-25 - 20190416-121328.240'
+    tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - 20190415-091034.881'
 
     #####################
     # Job configuration #
@@ -1474,6 +1484,7 @@
           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}'
@@ -1696,6 +1707,7 @@
           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}'
@@ -1997,6 +2009,7 @@
           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}'
@@ -2119,6 +2132,7 @@
           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}'