Changeset 21178

Timestamp:

09/01/16 12:43:57 (9 years ago)

Author:

glperez

Message:

CHG: Moving away from the SUCCESS file way of checking if externalpackage was installed directory. It seems like a much more effective measure is to check if the install directory is empty or not. Let's see how it goes.

File:

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

issm/trunk-jpl/jenkins/jenkins.sh

@@ -133 +133 @@
 
         #install if requested or if previous install has not been successful
-        if [ "$ISSM_EXTERNALPACKAGES" == "yes" ] || [ ! -f SUCCESS ]; then
+        if [ "$ISSM_EXTERNALPACKAGES" == "yes" ] || [ ! "$(ls -A $DIR)" ]; then
                 echo "======================================================";
                 echo "       Installing $PACKAGENAME                        ";
                 echo "======================================================";
-                ./$PACKAGEINST |  tee compil.log
+                ./$PACKAGEINST > compil.log
                 if [ $? -ne 0 ]; then
                         echo "======================================================";
@@ -148 +148 @@
                 else
                         echo "<testcase classname=\"externalpackages\" name=\"$PACKAGENAME\"/>" >> $EXTERNAL_TEST_FILE
-                        touch SUCCESS
                 fi
                 source $ISSM_DIR/etc/environment.sh