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

Timestamp:

12/08/20 08:45:53 (4 years ago)

Author:

Mathieu Morlighem

Message:

merged trunk-jpl and trunk for revision 25834

Location:

issm/trunk

Files:

• . (modified) (1 prop)
• packagers/linux/package-issm-linux-binaries.sh (modified) (5 diffs)

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

@@ -1 +1 @@
 #!/bin/bash
 
+
+# Script to test, package, and transfer distributable to ISSM Web site.
+# Corresponds with build generated by configuration in 
+# $ISSM_DIR/jenkins/ross-debian_linux-binaries.
+#
 
 ## Constants
@@ -6 +11 @@
 LIBGFORTRAN="/usr/lib/x86_64-linux-gnu/libgfortran.so.5.0.0" # Important that this is the library itself
 LIBGFORTRAN_DIST="${ISSM_DIR}/lib/libgfortran.so.5" # Important the file name matches the SONAME entry in the binaries and other shared libraries which link to it
-MATLAB_NROPTIONS="'exclude',[IdFromString('Dakota'),125,126]" # Exclude Dakota tests and any tests with transient solutions that require a restart
+MATLAB_NROPTIONS="'exclude',[IdFromString('Dakota')]"
 MATLAB_PATH="/usr/local/MATLAB/R2019b"
 PACKAGE="ISSM" # Name of directory to copy distributable files to
 TARBALL_NAME="issm-linux"
 TARBALL="${TARBALL_NAME}.tar.gz"
+
+## Environment
+#
+export PATH="${ISSM_DIR}/bin:$(getconf PATH)" # Ensure that we pick up binaries from 'bin' directory rather than 'externalpackages'
+
+# Check if MATLAB exists
+if ! [ -d ${MATLAB_PATH} ]; then
+        echo "${MATLAB_PATH} does not point to a MATLAB installation! Please modify MATLAB_PATH variable in $(basename $0) and try again."
+        exit 1
+fi
 
 # Clean up from previous packaging
@@ -53 +68 @@
 # Check that MATLAB did not exit in error
 matlabExitCode=`echo $?`
-matlabExitedInError=`grep -E "Activation cannot proceed|license" matlab.log | wc -l`
+matlabExitedInError=`grep -E "Activation cannot proceed|license|Error" matlab.log | wc -l`
 
 if [[ ${matlabExitCode} -ne 0 || ${matlabExitedInError} -ne 0 ]]; then
@@ -71 +86 @@
 if [[ ${numMatlabTestsFailed} -ne 0 ]]; then
         echo "One or more MATLAB tests FAILED"
-        exit 1;
+        exit 1
 else
         echo "All MATLAB tests PASSED"
@@ -86 +101 @@
 rm -f ${PACKAGE}/lib/*.a # Remove static libraries from package
 rm -f ${PACKAGE}/lib/*.la # Remove libtool libraries from package
+rm -rf ${PACKAGE}/test/SandBox # Remove testing sandbox from package
 echo "Creating tarball: ${TARBALL_NAME}"
 tar -czf ${TARBALL} ${PACKAGE}
 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