Fix ssh-copy-keys script

[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 b4f1cbf34522adf24c07eca8d2cb7d06c58bbb15..7bce8adcad321d4685e8c77842e2fbb93eda425b 100644 (file)
--- a/jjb/opendaylight-infra-copy-ssh-keys.sh
+++ b/jjb/opendaylight-infra-copy-ssh-keys.sh
@@ -7,7 +7,8 @@ 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
+        # shellcheck disable=SC2046
+        if [ $(ssh-copy-id -i /home/jenkins/.ssh/id_rsa.pub "jenkins@${i}" > /dev/null 2>&1) -eq 0 ]; then
             ssh "jenkins@${i}" 'echo "$(facter ipaddress_eth0) $(/bin/hostname)" | sudo tee -a /etc/hosts'
             echo "Successfully copied public keys to slave ${i}"
             break
@@ -32,10 +33,11 @@ function copy-ssh-keys-to-slave() {
 # 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" | \
+# shellcheck disable=SC2006
+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 | .[]')
+              .output_value | .[]'`)
 pids=""
 for i in "${ADDR[@]}"; do
     ( copy-ssh-keys-to-slave ) &