X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=blobdiff_plain;f=shell%2Fjenkins-configure-clouds.sh;h=78e233e7c2c2d5c47f363b3b53095ac90d83b1ac;hb=b55451a53da28d40c62de5cae462302a32fe4c31;hp=20092adbb7137b8cfe64dde33e55f081429af275;hpb=dd5b5b5782d06c17614671e07e519493c8475ebf;p=releng%2Fglobal-jjb.git

diff --git a/shell/jenkins-configure-clouds.sh b/shell/jenkins-configure-clouds.sh
index 20092adb..78e233e7 100644
--- a/shell/jenkins-configure-clouds.sh
+++ b/shell/jenkins-configure-clouds.sh
@@ -46,18 +46,15 @@ silos="${jenkins_silos:-jenkins}"
 
 set -eu -o pipefail
 
-os_plugin_version="$(lftools jenkins plugins list \
-  | grep -i 'OpenStack Cloud Plugin')"
-
 testversion() {
     local current_val="$1" operator="$2" test_value="$3"
     awk -vv1="$current_val" -vv2="$test_value" 'BEGIN {
       split(v1, a, /\:/);
-      if (a[2] == '$test_value') {
-        exit (a[2] == '$test_value') ? 0 : 1
+      if (a[2] == '"$test_value"') {
+        exit (a[2] == '"$test_value"') ? 0 : 1
       }
       else {
-        exit (a[2] '$operator' '$test_value') ? 0 : 1
+        exit (a[2] '"$operator"' '"$test_value"') ? 0 : 1
       }
     }'
 }
@@ -207,14 +204,14 @@ get_minion_options() {
         instance_cap=$(get_cfg "$cfg_file" INSTANCE_CAP "null")
     fi
 
-    floating_ip_pool=$(get_cfg "$cfg_file" FLOATING_IP_POOL "null")
+    floating_ip_pool=$(get_cfg "$cfg_file" FLOATING_IP_POOL "")
     security_groups=$(get_cfg "$cfg_file" SECURITY_GROUPS "default")
     availability_zone=$(get_cfg "$cfg_file" AVAILABILITY_ZONE "")
     start_timeout=$(get_cfg "$cfg_file" START_TIMEOUT "600000")
     kpn_default="$(get_cfg "$(dirname "$cfg_file")/cloud.cfg" KEY_PAIR_NAME "jenkins-ssh")"
     key_pair_name=$(get_cfg "$cfg_file" KEY_PAIR_NAME "$kpn_default")
     num_executors=$(get_cfg "$cfg_file" NUM_EXECUTORS "1")
-    jvm_options=$(get_cfg "$cfg_file" JVM_OPTIONS "null")
+    jvm_options=$(get_cfg "$cfg_file" JVM_OPTIONS "")
     fs_root=$(get_cfg "$cfg_file" FS_ROOT "/w")
     connection_type=$(get_cfg "$cfg_file" CONNECTION_TYPE "SSH")
     launcher_factory=$(get_launcher_factory "$connection_type")
@@ -319,6 +316,11 @@ for silo in $silos; do
     export JENKINS_USER
     export JENKINS_PASSWORD
 
+    # JENKINS_{URL,USER,PASSWORD} env vars are required for the "lftools jenkins
+    # plugins list" call
+    os_plugin_version="$(lftools jenkins plugins list \
+      | grep -i 'OpenStack Cloud Plugin')"
+
     echo "-----> Groovy script $script_file"
     for cloud in "${clouds[@]}"; do
         cfg_dir="${cloud}"
@@ -327,11 +329,14 @@ for silo in $silos; do
         mkdir -p "$(dirname "$insert_file")"
         rm -f "$insert_file"
 
-        echo "" >> "$insert_file"
-        echo "//////////////////////////////////////////////////" >> "$insert_file"
-        echo "// Cloud config for $(basename "$cloud")" >> "$insert_file"
-        echo "//////////////////////////////////////////////////" >> "$insert_file"
-        echo "" >> "$insert_file"
+        {
+            echo ""
+            echo "//////////////////////////////////////////////////"
+            echo "// Cloud config for $(basename "$cloud")"
+            echo "//////////////////////////////////////////////////"
+            echo ""
+        } >> "$insert_file"
+
 
         echo "templates = []" >> "$insert_file"
         mapfile -t templates < <(find "$cfg_dir" -maxdepth 1 -not -type d -not -name "cloud.cfg")