Changeset 20492

Timestamp:

04/11/16 14:01:19 (9 years ago)

Author:

glperez

Message:

CHG: Modified uploading logic to use public key crypto.

Location:

issm/trunk-jpl

Files:

• jenkins/macosx_pine-island_static (modified) (1 diff)
• packagers/macosx/package.sh (modified) (1 diff)

issm/trunk-jpl/jenkins/macosx_pine-island_static

@@ -22 +22 @@
         --with-m1qn3-dir=$ISSM_DIR/externalpackages/m1qn3/install \
         --with-fortran-lib="/usr/local/gfortran/lib/libgfortran.a /usr/local/gfortran/lib/libquadmath.a /usr/local/gfortran/lib/gcc/x86_64-apple-darwin14/5.2.0/libgcc.a" \
-        --with-numthreads=4 \
-        --enable-debugging'
+        --with-numthreads=4'
 
 #PYTHON and MATLAB testing

issm/trunk-jpl/packagers/macosx/package.sh

@@ -36 +36 @@
 
 echo "Shipping binaries to website"
-scp $tarball_name websites.jpl.nasa.gov:/home/larour/files/$tarball_name
+
+# 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/macosx-bins_richese-to-ross
+
+scp $tarball_name ross.ics.uci.edu:/var/www/html/$tarball_name
+
+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.
+fi