A few improvements to run-deploy.sh:

* deal with those annoying `Ignoring curb-0.9.10 because its extensions
are not built.  Try: gem pristine curb --version 0.9.10` warnings so we
don't display them, for real this time.

* prefix output of remote commands with the name of the host. That makes
determining which host is having issues easier when run with
--concurrency > 1

refs #16220

Arvados-DCO-1.1-Signed-off-by: Ward Vandewege <ward@jhvc.com>

diff --git a/jenkins/run-deploy.sh b/jenkins/run-deploy.sh
index d2c742e940019ba37c7c35f26982031ab1d1082c..0d87ca59ac7968a91133c705287bff2162e47dc0 100755 (executable)
--- a/jenkins/run-deploy.sh
+++ b/jenkins/run-deploy.sh
@@ -106,7 +106,10 @@ EXITCODE=0
 COLUMNS=80
 
 PUPPET_AGENT='
-__rvm_unload
+if [[ -e "/usr/local/rvm/scripts/rvm" ]]; then
+       source /usr/local/rvm/scripts/rvm
+       __rvm_unload
+fi
 now() { date +%s; }
 let endtime="$(now) + 600"
 while [ "$endtime" -gt "$(now)" ]; do
@@ -157,9 +160,9 @@ function run_apt() {
   sleep $[ $RANDOM / 6000 ].$[ $RANDOM / 1000 ]
   TMP_FILE=`mktemp`
   if [[ "$DEBUG" != "0" ]]; then
-    ssh -t -p$SSH_PORT -o "StrictHostKeyChecking no" -o "ConnectTimeout 5" root@$node -C bash -c "'$APT_AGENT'" | tee $TMP_FILE
+    ssh -t -p$SSH_PORT -o "StrictHostKeyChecking no" -o "ConnectTimeout 5" root@$node -C bash -c "'$APT_AGENT'" 2>&1 | sed 's/^/['"${node}"'] /' | tee $TMP_FILE
   else
-    ssh -t -p$SSH_PORT -o "StrictHostKeyChecking no" -o "ConnectTimeout 5" root@$node -C bash -c "'$APT_AGENT'" > $TMP_FILE 2>&1
+    ssh -t -p$SSH_PORT -o "StrictHostKeyChecking no" -o "ConnectTimeout 5" root@$node -C bash -c "'$APT_AGENT'" 2>&1 | sed 's/^/['"${node}"'] /' > $TMP_FILE 2>&1
   fi
 
   ECODE=${PIPESTATUS[0]}
@@ -193,9 +196,9 @@ function run_puppet() {
   sleep $[ $RANDOM / 6000 ].$[ $RANDOM / 1000 ]
   TMP_FILE=`mktemp`
   if [[ "$DEBUG" != "0" ]]; then
-    ssh -t -p$SSH_PORT -o "StrictHostKeyChecking no" -o "ConnectTimeout 5" root@$node -C bash -c "'$PUPPET_AGENT'" | tee $TMP_FILE
+    ssh -t -p$SSH_PORT -o "StrictHostKeyChecking no" -o "ConnectTimeout 5" root@$node -C bash -c "'$PUPPET_AGENT'" 2>&1 | sed 's/^/['"${node}"'] /' | tee $TMP_FILE
   else
-    ssh -t -p$SSH_PORT -o "StrictHostKeyChecking no" -o "ConnectTimeout 5" root@$node -C bash -c "'$PUPPET_AGENT'" > $TMP_FILE 2>&1
+    ssh -t -p$SSH_PORT -o "StrictHostKeyChecking no" -o "ConnectTimeout 5" root@$node -C bash -c "'$PUPPET_AGENT'" 2>&1 | sed 's/^/['"${node}"'] /' > $TMP_FILE 2>&1
   fi
 
   ECODE=${PIPESTATUS[0]}