X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=blobdiff_plain;f=shell%2Fjenkins-configure-clouds.sh;h=5a4e7a0652bd395f443db9e1263673ce3e5db863;hb=19cb59a5d60873873f6905b97266a8e919796dbc;hp=59c80a0dec07ba07b7466bce06a3e1ce1e489f78;hpb=76f492c41f20bc7bf634f3c40cb19cd4e26a54ed;p=releng%2Fglobal-jjb.git diff --git a/shell/jenkins-configure-clouds.sh b/shell/jenkins-configure-clouds.sh index 59c80a0d..5a4e7a06 100644 --- a/shell/jenkins-configure-clouds.sh +++ b/shell/jenkins-configure-clouds.sh @@ -69,7 +69,7 @@ get_cfg() { export get_cfg get_cloud_cfg() { - if [ -z $1 ]; then + if [ -z "$1" ]; then >&2 echo "Usage: get_cloud_cfg CFG_DIR" exit 1 fi @@ -100,7 +100,7 @@ get_cloud_cfg() { } get_launcher_factory() { - if [ -z $1 ]; then + if [ -z "$1" ]; then >&2 echo "Usage: get_launcher_factory JNLP|SSH" exit 1 fi @@ -118,7 +118,7 @@ get_launcher_factory() { } get_minion_options() { - if [ -z $1 ]; then + if [ -z "$1" ]; then >&2 echo "Usage: get_minion_options CFG_FILE" exit 1 fi @@ -129,6 +129,11 @@ get_minion_options() { # Create a flavor mapping to manage hardware_id until OpenStack Cloud # plugin supports using names declare -A flavors + # ShellCheck 0.4.4 incorrectly flags these as unused vars + # Fails on first instance of each different associatve array prefix + # Fails when using single/double/no quotes, all of which are valid bash + # shellcheck disable=SC2154 + flavors["acumos-highcpu-4-avx"]="c720c1f8-62e9-4695-823d-f7f54db46c86" flavors["lf-highcpu-2"]="1051d06a-61ea-45e3-b9b4-93de92880b27" flavors["lf-highcpu-4"]="35eb8e11-490f-4d1a-9f19-76091fc04547" flavors["lf-highcpu-8"]="68af673f-54ee-4255-871c-158c18e4f643" @@ -136,6 +141,7 @@ get_minion_options() { flavors["lf-standard-2"]="ef454088-7839-42a0-bf23-5e0ab6386a27" flavors["lf-standard-4"]="bd74e1e6-c2ed-475b-ab3f-2ce13936a215" flavors["lf-standard-8"]="32d74024-8418-41b6-9675-b77816748148" + # shellcheck disable=SC2154 flavors["odl-highcpu-2"]="def1b86f-b7f8-4943-b430-4a0599170006" flavors["odl-highcpu-4"]="0c8ec795-2ff8-4623-98cf-b4c1d92bb37c" flavors["odl-highcpu-8"]="458d6499-e2c8-4580-aa88-a4a04a33ee25" @@ -143,6 +149,7 @@ get_minion_options() { flavors["odl-standard-2"]="8ead227a-acfe-4290-be70-fbab92e6dd2f" flavors["odl-standard-4"]="f76fb18d-d5fb-4175-95c1-b29d8039d102" flavors["odl-standard-8"]="ba38b1af-4f87-4e4e-860e-94e8329d0d78" + # shellcheck disable=SC2154 flavors["v1-standard-1"]="bbcb7eb5-5c8d-498f-9d7e-307c575d3566" flavors["v1-standard-2"]="ca2a6e9c-2236-4107-8905-7ae9427132ff" flavors["v1-standard-4"]="5cf64088-893b-46b5-9bb1-ee020277635d" @@ -153,6 +160,7 @@ get_minion_options() { flavors["v1-standard-64"]="0c1d9008-f546-4608-9e8f-f8bdaec8dddd" flavors["v1-standard-96"]="5741c775-92a4-4488-bd77-dd7b08e2be81" flavors["v1-standard-128"]="e82d0a5b-8031-4526-9a5d-a15f7b4d48ff" + # shellcheck disable=SC2154 flavors["v2-highcpu-1"]="c04abb7a-2b61-4ed3-8ce8-6c40ad9df750" flavors["v2-highcpu-2"]="03bdf34e-8905-46bc-a4b9-8dbf94b6e06d" flavors["v2-highcpu-4"]="3b72e578-7875-4e0e-91b7-71ed292f3ca2" @@ -171,7 +179,7 @@ get_minion_options() { hardware_id=$(get_cfg "$cfg_file" HARDWARE_ID "") network_id=$(get_cfg "$cfg_file" NETWORK_ID "") - udi_default="$(get_cfg "$(dirname $cfg_file)/cloud.cfg" USER_DATA_ID "jenkins-init-script")" + udi_default="$(get_cfg "$(dirname "$cfg_file")/cloud.cfg" USER_DATA_ID "jenkins-init-script")" user_data_id=$(get_cfg "$cfg_file" USER_DATA_ID "$udi_default") # Handle Sandbox systems that might have a different cap. @@ -186,7 +194,7 @@ get_minion_options() { 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")" + 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") @@ -200,7 +208,7 @@ get_minion_options() { | grep -i 'OpenStack Cloud Plugin' \ | awk -F':' '{print $2}' | awk -F' ' '{print $1}')" if version_ge "$OS_PLUGIN_VER" "2.35"; then - if [ ! -z "$volume_size" ]; then + if [ -n "$volume_size" ]; then echo " new BootSource.VolumeFromImage(\"$image_name\", $volume_size)," else echo " new BootSource.Image(\"$image_name\")," @@ -222,7 +230,7 @@ get_minion_options() { echo " $retention_time" else # SlaveOptions() structure for versions <= 2.34 - if [ ! -z "$volume_size" ]; then + if [ -n "$volume_size" ]; then echo " new BootSource.VolumeFromImage(\"$image_name\", $volume_size)," else echo " new BootSource.Image(\"$image_name\")," @@ -245,7 +253,7 @@ get_minion_options() { } get_template_cfg() { - if [ -z $2 ]; then + if [ -z "$2" ]; then >&2 echo "Usage: get_template_cfg CFG_FILE SILO [MINION_PREFIX]" exit 1 fi @@ -255,7 +263,7 @@ get_template_cfg() { local minion_prefix="${3:-}" - template_name=$(basename $cfg_file .cfg) + template_name=$(basename "$cfg_file" .cfg) labels=$(get_cfg "$cfg_file" LABELS "") echo "minion_options = new SlaveOptions(" @@ -270,7 +278,7 @@ get_template_cfg() { echo ")" } -mapfile -t clouds < <(ls -d1 $OS_CLOUD_DIR/*/) +mapfile -t clouds < <(ls -d1 "$OS_CLOUD_DIR"/*/) for silo in $silos; do @@ -300,18 +308,18 @@ for silo in $silos; do for cloud in "${clouds[@]}"; do cfg_dir="${cloud}" echo "Processing $cfg_dir" - insert_file="$SCRIPT_DIR/$silo/$(basename $cloud)/cloud-cfg.txt" - mkdir -p "$(dirname $insert_file)" + insert_file="$SCRIPT_DIR/$silo/$(basename "$cloud")/cloud-cfg.txt" + mkdir -p "$(dirname "$insert_file")" rm -f "$insert_file" echo "" >> "$insert_file" echo "//////////////////////////////////////////////////" >> "$insert_file" - echo "// Cloud config for $(basename $cloud)" >> "$insert_file" + echo "// Cloud config for $(basename "$cloud")" >> "$insert_file" echo "//////////////////////////////////////////////////" >> "$insert_file" echo "" >> "$insert_file" - echo "templates = []" >> $insert_file - mapfile -t templates < <(find $cfg_dir -maxdepth 1 -not -type d -not -name "cloud.cfg") + 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" "$silo" "$node_prefix" >> "$insert_file" echo "templates.add(template)" >> "$insert_file"