From 378931853c6d13abd77404db9018a13d3794e87e Mon Sep 17 00:00:00 2001 From: Thanh Ha Date: Mon, 25 Jun 2018 12:37:58 -0400 Subject: [PATCH] Fix empty variable when run in Jenkins Change-Id: Ic6e2b1424e8e59611e021c4a506ba556e8e2111e Signed-off-by: Thanh Ha --- shell/jenkins-configure-clouds.sh | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/shell/jenkins-configure-clouds.sh b/shell/jenkins-configure-clouds.sh index da0b7325..14a2c81a 100644 --- a/shell/jenkins-configure-clouds.sh +++ b/shell/jenkins-configure-clouds.sh @@ -46,17 +46,6 @@ mkdir -p "$SCRIPT_DIR" silos="${jenkins_silos:-jenkins}" -set +x # Disable `set -x` to prevent printing passwords -echo "Configuring $silo" -JENKINS_URL=$(crudini --get "$HOME"/.config/jenkins_jobs/jenkins_jobs.ini "$silo" url) -JENKINS_USER=$(crudini --get "$HOME"/.config/jenkins_jobs/jenkins_jobs.ini "$silo" user) -JENKINS_PASSWORD=$(crudini --get "$HOME"/.config/jenkins_jobs/jenkins_jobs.ini "$silo" password) -export JENKINS_URL -export JENKINS_USER -export JENKINS_PASSWORD -OS_PLUGIN_VER="$(lftools jenkins plugins list \ - | grep 'Openstack Cloud Plugin' | awk -F':' '{print $2}')" - set -eu -o pipefail version_ge() { test "$(echo "$@" | tr " " "\n" | sort -rV | head -n 1)" == "$1"; } @@ -178,6 +167,8 @@ get_minion_options() { fs_root=$(get_cfg "$cfg_file" FS_ROOT "/w") retention_time=$(get_cfg "$cfg_file" RETENTION_TIME "0") + OS_PLUGIN_VER="$(lftools jenkins plugins list \ + | grep '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)," @@ -264,6 +255,15 @@ for silo in $silos; do node_prefix="${silo}-" fi + set +x # Disable `set -x` to prevent printing passwords + echo "Configuring $silo" + JENKINS_URL=$(crudini --get "$HOME"/.config/jenkins_jobs/jenkins_jobs.ini "$silo" url) + JENKINS_USER=$(crudini --get "$HOME"/.config/jenkins_jobs/jenkins_jobs.ini "$silo" user) + JENKINS_PASSWORD=$(crudini --get "$HOME"/.config/jenkins_jobs/jenkins_jobs.ini "$silo" password) + export JENKINS_URL + export JENKINS_USER + export JENKINS_PASSWORD + echo "-----> Groovy script $script_file" for cloud in "${clouds[@]}"; do cfg_dir="${cloud}" -- 2.16.6