From e4d737cd1f54748979320df45f350fb48b99de97 Mon Sep 17 00:00:00 2001
From: Jamo Luhrsen <jluhrsen@gmail.com>
Date: Fri, 14 Feb 2020 13:15:16 -0800
Subject: [PATCH] Quote param values to force them to be strings

The jjb-deploy gerrit keyword that triggers the builder-jjb-deploy-job
is failing when passing a CSIT job as an argument. It was working with
another non-csit job (I tried a mvn-merge job). After some debugging,
I saw that some python lib (ElementTree.py) was throwing an exception
because a value was seen as an Int and not a string. It turned out to
be coming from our vm_x_count parameter in our csit templates. From
what I can tell, everything is now a string for those. My only guess
to why this used to work before is that some lib version has changed
and now more strict.

Signed-off-by: Jamo Luhrsen <jluhrsen@gmail.com>
Change-Id: If17d8e0f67e1c96f0473acd2b68ddf3aaf40d9f7
---
 jjb/integration/integration-templates.yaml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/jjb/integration/integration-templates.yaml b/jjb/integration/integration-templates.yaml
index f0165cf61..6ae692419 100644
--- a/jjb/integration/integration-templates.yaml
+++ b/jjb/integration/integration-templates.yaml
@@ -103,7 +103,7 @@
           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}'
@@ -211,7 +211,7 @@
           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}'
@@ -449,7 +449,7 @@
           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}'
@@ -516,7 +516,7 @@
           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}'
@@ -626,7 +626,7 @@
           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}'
@@ -865,7 +865,7 @@
           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}'
@@ -933,7 +933,7 @@
           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}'
-- 
2.36.6