Changeset 26778

Timestamp:

01/13/22 13:02:46 (3 years ago)

Author:

jdquinn

Message:

BUG: MATLAB command for Windows was removed accidentally; reduced timeout

File:

• issm/trunk-jpl/jenkins/jenkins.sh (modified) (2 diffs)

issm/trunk-jpl/jenkins/jenkins.sh

@@ -346 +346 @@
                 cd $ISSM_DIR/test/NightlyRun
 
-                $MATLAB_PATH/bin/matlab -nodisplay -nosplash -nojvm -r "addpath ${ISSM_DIR}/src/m/dev; devpath; addpath ${ISSM_DIR}/nightlylog; matlab_run$i" &> ${ISSM_DIR}/nightlylog/matlab_log$i.log
+                if [[ "${OS}" == CYGWIN* || ${MINGW} -eq 1 ]]; then
+                        $MATLAB_PATH/bin/matlab -nodesktop -nosplash -nojvm -r "addpath ${ISSM_DIR_WIN}/src/m/dev; devpath; addpath ${ISSM_DIR_WIN}/nightlylog; matlab_run$i" &> ${ISSM_DIR}/nightlylog/matlab_log$i.log
+                else
+                        $MATLAB_PATH/bin/matlab -nodisplay -nosplash -nojvm -r "addpath ${ISSM_DIR}/src/m/dev; devpath; addpath ${ISSM_DIR}/nightlylog; matlab_run$i" &> ${ISSM_DIR}/nightlylog/matlab_log$i.log
+                fi
         done
 
@@ -376 +380 @@
                 # Time out after $max_time seconds because sometimes multiple MATLAB processes get locked in race condition
                 timer=0
-                max_time=10800
+                max_time=7200
                 while [[ $timer -lt $max_time && -n "${pid}" ]]; do
                         pid=$(ps -W | grep MATLAB | awk '{print $1}')