upload_packages_testing_to_stable.sh add trailing '*' to package patterns

run-cwl-test.sh: log ssh command on DEBUG

no issue #

diff --git a/jenkins/run-cwl-test.sh b/jenkins/run-cwl-test.sh
index c2f26839d0e0c39ed91b846edcc0246ed4fb1ae7..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

diff --git a/jenkins/upload_packages_testing_to_stable.sh b/jenkins/upload_packages_testing_to_stable.sh
index 0e3860652823c5b21890dad1e20df7dab089bb76..66ecd9747036edd9eb2c43a6005cab933ffeaa37 100755 (executable)
--- a/jenkins/upload_packages_testing_to_stable.sh
+++ b/jenkins/upload_packages_testing_to_stable.sh
@@ -7,6 +7,8 @@
 # Parameters: list of packages, space separated, to move from *-testing to *
 # under /var/lib/freight/apt/ in host public.curoverse.com
 
+set -x
+
 APT_REPO_SERVER="apt.arvados.org"
 RPM_REPO_SERVER="rpm.arvados.org"
 
@@ -29,7 +31,7 @@ fi
 
 # Sanitize the vars in a way suitable to be used by the remote 'publish_packages.sh' script
 # Just to make copying a single line, and not having to loop over it
-PACKAGES_LIST=$(echo ${PACKAGES_TO_PUBLISH} | sed 's/[a-z-]*-gem: [0-9\.]*//g; s/versions://g; s/\([0-9]\)[$, ]/\1* /g; s/[[:blank:]]\+/,/g; s/^,//g; s/:,/*/g')
+PACKAGES_LIST=$(echo ${PACKAGES_TO_PUBLISH}\* | sed 's/[a-z-]*-gem: [0-9\.]*//g; s/versions://g; s/\([0-9]\)[$, ]/\1* /g; s/[[:blank:]]\+/,/g; s/^,//g; s/:,/*/g')
 
 DISTROS=$(echo "${LSB_DISTRIB_CODENAMES}"|sed s/[[:space:]]/,/g |tr '[:upper:]' '[:lower:]')
 
@@ -51,6 +53,7 @@ ssh -t \
     -o "ConnectTimeout 5" \
     ${REPO_SERVER} \
     "${REMOTE_CMD}" | tee ${TMP_FILE}
+ECODE=$?
 
 grep -q "FAILED TO PUBLISH" ${TMP_FILE}
 if [ $? -eq 0 ]; then