Changeset 24703 for issm/trunk-jpl/packagers/linux/package-issm-linux-binaries.sh

Timestamp:

04/08/20 10:36:32 (5 years ago)

Author:

jdquinn

Message:

CHG: No longer relying on ssh-agent to ship binaries; reverting uncommented blocks of packaging scripts

File:

• issm/trunk-jpl/packagers/linux/package-issm-linux-binaries.sh (modified) (2 diffs)

issm/trunk-jpl/packagers/linux/package-issm-linux-binaries.sh

@@ -71 +71 @@
 if [[ ${numMatlabTestsFailed} -ne 0 ]]; then
         echo "One or more MATLAB tests FAILED"
-        exit 1;
+        exit 1
 else
         echo "All MATLAB tests PASSED"
@@ -90 +90 @@
 ls -lah ${ISSM_DIR}/${TARBALL}
 
-echo "Shipping binaries to website"
-
-# We're using public key authentication method to upload the tarball The
-# following lines check to see if the SSH Agent is running. If not, then it is
-# started and relevant information is forwarded to a script.
-pgrep "ssh-agent" > /dev/null
-if [ $? -ne 0 ]; then
-        echo "SSH Agent is not running. Starting it..."
-        ssh-agent > ~/.ssh/agent.sh
-else
-        echo "SSH Agent is running..."
-fi
-
-source ~/.ssh/agent.sh
-ssh-add ~/.ssh/debian_linux-vm_to_ross
-
-scp ${TARBALL} ross.ics.uci.edu:/var/www/html/${TARBALL}
+echo "Transferring binaries to ISSM Web site"
+scp -i ~/.ssh/debian_linux-vm_to_ross ${TARBALL} jenkins@ross.ics.uci.edu:/var/www/html/${TARBALL}
 
 if [ $? -ne 0 ]; then
-        echo "The upload failed."
-        echo "Perhaps the SSH Agent was started by some other means."
-        echo "Try killing the agent and running again."
+        echo "FAILED: Manually check connection"
+        exit 1
 fi