From: Thanh Ha <thanh.ha@linuxfoundation.org>
Date: Mon, 9 Jul 2018 22:14:07 +0000 (-0400)
Subject: Fix API breakage caused by OS Plugin version scan
X-Git-Tag: v0.21.5
X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=commitdiff_plain;ds=inline;h=e3b7a74eb13d695e7416f112ba418dd805e15dae;hp=f58aa56acc44a8eb7498af10e5d229e1690e58b0;p=releng%2Fglobal-jjb.git

Fix API breakage caused by OS Plugin version scan

Patch I3384c86c64c3aff7404ddec77aa85463e5fbac2a caused an unexpected
API change in get_minion_options which now requires a $silo
variable. However the change was not passed down to all instances
where the function was called causing breakage.

Change-Id: If4a0cec0232d1381413da3f6279f23bc426e1ace
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>
---

diff --git a/shell/jenkins-configure-clouds.sh b/shell/jenkins-configure-clouds.sh
index 00bd2d77..d8782c36 100644
--- a/shell/jenkins-configure-clouds.sh
+++ b/shell/jenkins-configure-clouds.sh
@@ -168,7 +168,7 @@ get_minion_options() {
     retention_time=$(get_cfg "$cfg_file" RETENTION_TIME "0")
 
     OS_PLUGIN_VER="$(lftools jenkins plugins list \
-        | grep 'Openstack Cloud Plugin' | awk -F':' '{print $2}')"
+        | grep -i 'OpenStack Cloud Plugin' | awk -F':' '{print $2}')"
     if version_ge "$OS_PLUGIN_VER" "2.35"; then
         if [ ! -z "$volume_size" ]; then
             echo "    new BootSource.VolumeFromImage(\"$image_name\", $volume_size),"
@@ -215,19 +215,21 @@ get_minion_options() {
 }
 
 get_template_cfg() {
-    if [ -z $1 ]; then
-        >&2 echo "Usage: get_template_cfg CFG_FILE"
+    if [ -z $2 ]; then
+        >&2 echo "Usage: get_template_cfg CFG_FILE SILO [MINION_PREFIX]"
         exit 1
     fi
 
     local cfg_file="$1"
-    local minion_prefix="${2:-}"
+    local silo="${2}"
+    local minion_prefix="${3:-}"
+
 
     template_name=$(basename $cfg_file .cfg)
     labels=$(get_cfg "$cfg_file" LABELS "")
 
     echo "minion_options = new SlaveOptions("
-    get_minion_options "$cfg_file"
+    get_minion_options "$cfg_file" "$silo"
     echo ")"
 
     echo "template = new JCloudsSlaveTemplate("
@@ -281,7 +283,7 @@ for silo in $silos; do
         echo "templates = []" >> $insert_file
         mapfile -t templates < <(find $cfg_dir -maxdepth 1 -not -type d -not -name "cloud.cfg")
         for template in "${templates[@]}"; do
-            get_template_cfg "$template" "$node_prefix" >> "$insert_file"
+            get_template_cfg "$template" "$silo" "$node_prefix" >> "$insert_file"
             echo "templates.add(template)" >> "$insert_file"
         done