Fix target check

[arvados-dev.git] / jenkins / run-cwl-test.sh

diff --git a/jenkins/run-cwl-test.sh b/jenkins/run-cwl-test.sh
index c4e76dba589b778096508d040a0df9e12687e531..71c08c6d77d94549eac7b74b80fcd81e49c20b3d 100755 (executable)
--- a/jenkins/run-cwl-test.sh
+++ b/jenkins/run-cwl-test.sh
@@ -147,6 +147,7 @@ function run_command() {
     title "Running '${command/ARVADOS_API_TOKEN=* /ARVADOS_API_TOKEN=suppressed }' on $node"
     TMP_FILE=`mktemp`
     if [[ "$DEBUG" != "0" ]]; then
+      echo ssh -t -p$SSH_PORT -o "StrictHostKeyChecking no" -o "ConnectTimeout 125" $ACCT@$node -C "$command" | tee $TMP_FILE
       ssh -t -p$SSH_PORT -o "StrictHostKeyChecking no" -o "ConnectTimeout 125" $ACCT@$node -C "$command" | tee $TMP_FILE
       ECODE=$?
     else
@@ -167,7 +168,7 @@ function run_command() {
       title "Connection denied or timed out"
     fi
   else
-    title "Running '${command/ARVADOS_API_TOKEN=*/ARVADOS_API_TOKEN=suppressed}' locally"
+    title "Running '${command/ARVADOS_API_TOKEN=* /ARVADOS_API_TOKEN=suppressed }' locally"
     TMP_FILE=`mktemp`
     if [[ "$DEBUG" != "0" ]]; then
       bash -c "$command" | tee $TMP_FILE
@@ -215,7 +216,7 @@ if [[ "$ECODE" != "0" ]]; then
   exit $ECODE
 fi
 
-run_command shell.$IDENTIFIER ECODE "printf \"%s\n%s\n\" '#!/bin/sh' 'exec arvados-cwl-runner --compute-checksum --disable-reuse \"\$@\"' > ~$ACCT/arvados-cwl-runner-with-checksum.sh; chmod 755 ~$ACCT/arvados-cwl-runner-with-checksum.sh"
+run_command shell.$IDENTIFIER ECODE "printf \"%s\n%s\n\" '#!/bin/sh' 'exec arvados-cwl-runner --api containers --compute-checksum --disable-reuse \"\$@\"' > ~$ACCT/arvados-cwl-runner-with-checksum.sh; chmod 755 ~$ACCT/arvados-cwl-runner-with-checksum.sh"
 
 if [[ "$ECODE" != "0" ]]; then
   echo "Failed to create ~$ACCT/arvados-cwl-runner-with-checksum.sh"