X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=blobdiff_plain;f=shell%2Fjenkins-configure-clouds.sh;h=5d394ad29af792f0212c75096ce80d9dfdf5c005;hb=01a96e082d0f87e93cfe49157685a70a3e87bd04;hp=405ecedfe56bd9acb0f846580c953488d687b096;hpb=ba4d6e09d765acef795daff7c6db701e73652382;p=releng%2Fglobal-jjb.git

diff --git a/shell/jenkins-configure-clouds.sh b/shell/jenkins-configure-clouds.sh
index 405ecedf..5d394ad2 100644
--- a/shell/jenkins-configure-clouds.sh
+++ b/shell/jenkins-configure-clouds.sh
@@ -46,9 +46,6 @@ 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 {
@@ -207,7 +204,7 @@ 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")
@@ -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}"