Quote param values to force them to be strings 15/88415/1
authorJamo Luhrsen <jluhrsen@gmail.com>
Thu, 12 Mar 2020 23:58:25 +0000 (16:58 -0700)
committerJamo Luhrsen <jluhrsen@gmail.com>
Thu, 12 Mar 2020 23:58:25 +0000 (16:58 -0700)
A similar change was done previously in:
  https://git.opendaylight.org/gerrit/c/releng/builder/+/87716

this is only a problem in jjb versions < 2.9 I think. the jjb-deploy
job is using 2.8. Latest versions are 3.x, as far as I know, so 2.8
might be a little old at this point.

Signed-off-by: Jamo Luhrsen <jluhrsen@gmail.com>
Change-Id: I11b5ecd246fface0204d188ccb57b26d044c3f2c

jjb/integration/integration-templates.yaml

index 5a3c431f82b8000170ad3eddb18f0f74ade0692f..e077c34aecd47d8b07865a08b4b4b5af2345a970 100644 (file)
@@ -80,7 +80,7 @@
     odl_system_flavor: 'odl-highcpu-4'
     odl_system_image: 'ZZCI - CentOS 7 - builder - x86_64 - 20191201-060129.829'
     controller-max-mem: '2048m'
-    tools_system_count: 1
+    tools_system_count: '1'
     tools_system_flavor: 'odl-highcpu-2'
     tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - 20190415-091034.881'
 
     odl_system_flavor: 'odl-highcpu-4'
     odl_system_image: 'ZZCI - CentOS 7 - builder - x86_64 - 20191201-060129.829'
     controller-max-mem: '2048m'
-    tools_system_count: 1
+    tools_system_count: '1'
     tools_system_flavor: 'odl-highcpu-2'
     tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - 20190415-091034.881'
 
     odl_system_flavor: 'odl-highcpu-4'
     odl_system_image: 'ZZCI - CentOS 7 - builder - x86_64 - 20191201-060129.829'
     controller-max-mem: '2048m'
-    tools_system_count: 1
+    tools_system_count: '1'
     tools_system_flavor: 'odl-highcpu-2'
     tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - 20190415-091034.881'
 
     odl_system_flavor: 'odl-highcpu-4'
     odl_system_image: 'ZZCI - CentOS 7 - builder - x86_64 - 20191201-060129.829'
     controller-max-mem: '2048m'
-    tools_system_count: 1
+    tools_system_count: '1'
     tools_system_flavor: 'odl-highcpu-2'
     tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - 20190415-091034.881'
 
     odl_system_flavor: 'odl-highcpu-4'
     odl_system_image: 'ZZCI - CentOS 7 - builder - x86_64 - 20191201-060129.829'
     controller-max-mem: '2048m'
-    docker_system_count: 1
+    docker_system_count: '1'
     docker_system_flavor: 'odl-standard-1'
     docker_system_image: 'ZZCI - CentOS 7 - docker - x86_64 - 20191004-045622.840'
 
           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:
           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: