Fix ShellCheck issues in jjb/*.sh

[releng/builder.git] / jjb / opendaylight-infra-copy-ssh-keys.sh

diff --git a/jjb/opendaylight-infra-copy-ssh-keys.sh b/jjb/opendaylight-infra-copy-ssh-keys.sh
index 5436930ee7fe5d1eea1d56de0a49f97653b7fd2e..b4f1cbf34522adf24c07eca8d2cb7d06c58bbb15 100644 (file)
--- a/jjb/opendaylight-infra-copy-ssh-keys.sh
+++ b/jjb/opendaylight-infra-copy-ssh-keys.sh
@@ -1,26 +1,41 @@
 #!/bin/bash
+echo "----------> Copy ssh public keys to csit lab"
+
+# shellcheck disable=SC1090
+source "$WORKSPACE/.venv-openstack/bin/activate"
+
 function copy-ssh-keys-to-slave() {
     RETRIES=60
     for j in $(seq 1 $RETRIES); do
-        if `ssh-copy-id -i /home/jenkins/.ssh/id_rsa.pub "jenkins@${i}" > /dev/null 2>&1`; then
-            ssh jenkins@${i} 'echo "$(facter ipaddress_eth0) $(/bin/hostname)" | sudo tee -a /etc/hosts'
+        if ssh-copy-id -i /home/jenkins/.ssh/id_rsa.pub "jenkins@${i}" > /dev/null 2>&1; then
+            ssh "jenkins@${i}" 'echo "$(facter ipaddress_eth0) $(/bin/hostname)" | sudo tee -a /etc/hosts'
             echo "Successfully copied public keys to slave ${i}"
             break
-        elif [ $j -eq $RETRIES ]; then
+        elif [ "$j" -eq $RETRIES ]; then
             echo "SSH not responding on ${i} after $RETIRES tries. Giving up."
             exit 1
         else
             echo "SSH not responding on ${i}. Retrying in 10 seconds..."
             sleep 10
         fi
+
+        # ping test to see if connectivity is available
+        if ping -c1 "${i}" &> /dev/null; then
+            echo "Ping to ${i} successful."
+        else
+            echo "Ping to ${i} failed."
+        fi
     done
 }
 
-source $WORKSPACE/.venv-openstack/bin/activate
-CONTROLLER_IPS=`openstack --os-cloud rackspace stack show -f json -c outputs $STACK_NAME | jq -r '.outputs[] | select(.output_key=="vm_0_ips") | .output_value[]'`
-MININET_IPS=`openstack --os-cloud rackspace stack show -f json -c outputs $STACK_NAME | jq -r '.outputs[] | select(.output_key=="vm_1_ips") | .output_value[]'`
-ADDR=($CONTROLLER_IPS $MININET_IPS)
+# Print the Stack outputs parameters so that we can identify which IPs belong
+# to which VM types.
+openstack --os-cloud rackspace stack show -c outputs "$STACK_NAME"
 
+ADDR=$(openstack --os-cloud rackspace stack show -f json -c outputs "$STACK_NAME" | \
+       jq -r '.outputs[] |
+              select(.output_key | match("^vm_[0-9]+_ips\$")) |
+              .output_value | .[]')
 pids=""
 for i in "${ADDR[@]}"; do
     ( copy-ssh-keys-to-slave ) &
@@ -30,7 +45,7 @@ done
 
 # Detect when a process failed to copy ssh keys and fail build
 for p in $pids; do
-    if wait $p; then
+    if wait "$p"; then
         echo "Process $p successfully copied ssh keys."
     else
         echo "Process $p failed to copy ssh keys."