Changeset 20428

Timestamp:

04/01/16 13:18:19 (9 years ago)

Author:

Mathieu Morlighem

Message:

CHG: check if externalpackages have been installed even if ISSM_EXTERNALPACKAGES is none

File:

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

issm/trunk-jpl/jenkins/jenkins.sh

@@ -98 +98 @@
 #}}}
 #install/none external packages    (ISSM_EXTERNALPACKAGES){{{
-if [ "$ISSM_EXTERNALPACKAGES" == "install" ]
-then
-        #number of packages: 
-        NUMPACKAGES=$(($(echo $EXTERNALPACKAGES | wc -w )/2))
-        EXTERNAL_TEST_FILE="$ISSM_DIR/nightlylog/results/external.xml"
-
-        mkdir -p $ISSM_DIR/nightlylog/results
-
-        echo "<testsuite tests=\"$NUMPACKAGES\">" > $EXTERNAL_TEST_FILE
-
-        for ((i=1;i<=$NUMPACKAGES;i++))
-        do
-                NUM1=$((2*$i-1))
-                NUM2=$((2*$i))
-                PACKAGENAME=$(echo $EXTERNALPACKAGES | cut -d " " -f $NUM1-$NUM1)
-                PACKAGEINST=$(echo $EXTERNALPACKAGES | cut -d " " -f $NUM2-$NUM2)
-
-                cd $ISSM_DIR/externalpackages/$PACKAGENAME
+
+#Jenkins xml files for individual packages
+EXTERNAL_TEST_FILE="$ISSM_DIR/nightlylog/results/external.xml"
+mkdir -p $ISSM_DIR/nightlylog/results
+echo "<testsuite tests=\"$NUMPACKAGES\">" > $EXTERNAL_TEST_FILE
+
+#number of packages: 
+NUMPACKAGES=$(($(echo $EXTERNALPACKAGES | wc -w )/2))
+for ((i=1;i<=$NUMPACKAGES;i++))
+do
+        NUM1=$((2*$i-1))
+        NUM2=$((2*$i))
+        PACKAGENAME=$(echo $EXTERNALPACKAGES | cut -d " " -f $NUM1-$NUM1)
+        PACKAGEINST=$(echo $EXTERNALPACKAGES | cut -d " " -f $NUM2-$NUM2)
+
+        cd $ISSM_DIR/externalpackages/$PACKAGENAME
+
+        #install if requested or if install does not exist
+        if [ "$ISSM_EXTERNALPACKAGES" == "install" ] || [ ! -d install ];
+        then
                 echo "======================================================";
                 echo "       Installing $PACKAGENAME                        ";
@@ -133 +135 @@
                 fi
                 source $ISSM_DIR/etc/environment.sh
-                cd ..
-        done
-        echo '</testsuite>' >> $EXTERNAL_TEST_FILE
-
-elif [ "$ISSM_EXTERNALPACKAGES" == "none" ]
-then
-        echo "Skipping external packages installation"
-else
-        echo "ISSM_EXTERNALPACKAGES supported values are: install, copy and none. Exiting..." >&2 # Error message to stderr.
-        exit 1
-fi
+        else
+                echo "======================================================";
+                echo "       Skipping $PACKAGENAME                          ";
+                echo "======================================================";
+        fi
+done
+echo '</testsuite>' >> $EXTERNAL_TEST_FILE
 
 source $ISSM_DIR/etc/environment.sh
@@ -149 +147 @@
 if [ "$OS" == "win" ]
 then
-        echo "WINDOWS ENVIRONMENT DETECTED"
+        echo " == WINDOWS ENVIRONMENT DETECTED =="
         source $ISSM_DIR/externalpackages/windows/windows_environment.sh
 fi
-
 #}}}
 #ISSM compilation yes/no                (ISSM_COMPILATION) {{{