Changeset 21182

Timestamp:

09/01/16 14:25:03 (9 years ago)

Author:

glperez

Message:

CHG: Adding logic for handling externalpackages that do not create install dir. Also, adding tests for externalpackages even when skipped.

File:

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

issm/trunk-jpl/jenkins/jenkins.sh

@@ -116 +116 @@
 #Install external packages    (ISSM_EXTERNALPACKAGES){{{
 
+#number of packages: 
+NUMPACKAGES=$(($(echo $EXTERNALPACKAGES | wc -w )/2))
+
 #Jenkins xml files for individual packages
 EXTERNAL_TEST_FILE="$ISSM_DIR/nightlylog/results/external.xml"
@@ -121 +124 @@
 echo "<testsuite tests=\"$NUMPACKAGES\">" > $EXTERNAL_TEST_FILE
 
-#number of packages: 
-NUMPACKAGES=$(($(echo $EXTERNALPACKAGES | wc -w )/2))
 for ((i=1;i<=$NUMPACKAGES;i++))
 do
@@ -137 +138 @@
                 echo "       Installing $PACKAGENAME                        ";
                 echo "======================================================";
+
+                # Jenkins needs to now whether the installation of externalpackages suceeded or not.
+                # The majority of externalpackages populate an install directory with various files.
+                # However, a few do not do this. Consequently, we need a way to confirm that these 
+                # packages were installed correctly. The following accomplishes this without polluting
+                # installation directories.
+                echo "if [ ! -d ./install ]; then" >> ./$PACKAGEINST
+                echo "\tmkdir ./install" >> ./$PACKAGEINST
+                echo "fi" >> ./$PACKAGEINST
+                echo "touch ./install/SUCCESS" >> ./$PACKAGEINST
+
                 ./$PACKAGEINST > compil.log
                 if [ $? -ne 0 ]; then
@@ -158 +170 @@
                 echo "       Skipping $PACKAGENAME                          ";
                 echo "======================================================";
+                echo "<testcase classname=\"externalpackages\" name=\"$PACKAGENAME\"/>" >> $EXTERNAL_TEST_FILE
         fi
 done