Changeset 22758 for issm/trunk/jenkins/jenkins.sh

Timestamp:

05/10/18 10:24:27 (7 years ago)

Author:

Mathieu Morlighem

Message:

merged trunk-jpl and trunk for revision 22757

Location:

issm/trunk

Files:

• . (modified) (1 prop)
• jenkins/jenkins.sh (modified) (5 diffs)

issm/trunk/jenkins/jenkins.sh

@@ -157 +157 @@
                         echo "    ERROR: installation of $PACKAGENAME failed        ";
                         echo "======================================================";
+                        cat compil.log
                         echo "<testcase classname=\"externalpackages\" name=\"$PACKAGENAME\">" >> $EXTERNAL_TEST_FILE
                         echo '<failure message="failure">External packages did not install right. Check it.' >> $EXTERNAL_TEST_FILE
@@ -240 +241 @@
                 make
         fi
+        if [ $? -ne 0 ] && [ $NUMCPUS_INSTALL -gt 1 ]; then 
+                echo " "
+                echo "Compilation failed, trying to compile with only one threatd"
+                echo " "
+                make
+        fi
         if [ $? -ne 0 ]; then 
                 echo "ISSM_COMPILATION failed!"
@@ -320 +327 @@
 echo '-----------------------------'
 
-rm matlab_log.log
+if [ -f matlab_log.log ]; then
+        rm matlab_log.log
+fi
 
 for job in `jobs -p`
@@ -342 +351 @@
 if [ $PYTHON_TEST -eq 1 ]; then
 #Launch all tests on different cpus
-PYTHON_START_TIME=$(timer);
 export PYTHONSTARTUP=$ISSM_DIR/src/m/dev/devpath.py
 export PYTHONUNBUFFERED=1 #we don't want python to buffer otherwise issm.exe output is not captured
@@ -355 +363 @@
 # concatenate reports
 cd $ISSM_DIR/nightlylog/
-rm python_log.log
+if [ -f python_log.log ]; then
+        rm python_log.log
+fi
 
 for job in `jobs -p`