Changeset 20509

Timestamp:

04/13/16 19:40:30 (9 years ago)

Author:

Mathieu Morlighem

Message:

CHG: better way of dealing with externalpackages

File:

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

issm/trunk-jpl/jenkins/jenkins.sh

@@ -115 +115 @@
         cd $ISSM_DIR/externalpackages/$PACKAGENAME
 
-        #install if requested or if install does not exist
-        if [ "$ISSM_EXTERNALPACKAGES" == "install" ] || [ ! -d install ] || [ ! "$(ls -A install)" ];
-        then
+        #install if requested or if previous install has not been successful
+        if [ "$ISSM_EXTERNALPACKAGES" == "install" ] || [ ! -f SUCCESS ]; then
                 echo "======================================================";
                 echo "       Installing $PACKAGENAME                        ";
@@ -126 +125 @@
                         echo "    ERROR: installation of $PACKAGENAME failed        ";
                         echo "======================================================";
-                        #erase install directory, so that next time, we still try and compile this!
-                        rm -rf install
                         echo "<testcase classname=\"externalpackages\" name=\"$PACKAGENAME\">" >> $EXTERNAL_TEST_FILE
                         echo '<failure message="failure">External packages did not install right. Check it.</failure>' >> $EXTERNAL_TEST_FILE
                         echo '</testcase>' >> $EXTERNAL_TEST_FILE
+                        exit 1
                 else
                         echo "<testcase classname=\"externalpackages\" name=\"$PACKAGENAME\"/>" >> $EXTERNAL_TEST_FILE
+                        touch SUCCESS
                 fi
                 source $ISSM_DIR/etc/environment.sh