Changeset 20395

Timestamp:

03/30/16 20:33:37 (9 years ago)

Author:

Mathieu Morlighem

Message:

CHG: fixing parser

Location:

issm/trunk-jpl/jenkins

Files:

• imac-012301-gil (modified) (1 diff)
• jenkins.sh (modified) (3 diffs)
• linux64_murdo (modified) (1 diff)
• macosx_pine-island (modified) (1 diff)

issm/trunk-jpl/jenkins/imac-012301-gil

@@ -25 +25 @@
 MATLAB_TEST=1
 PYTHON_TEST=0
-
-#execution path used for parallel runs
-EXECUTION_PATH=$ISSM_DIR/execution
-
-#repo:
-REPOSITORY="https://issm.ess.uci.edu/svn/issm/issm/trunk-jpl"
 
 #-----------------------------------#

issm/trunk-jpl/jenkins/jenkins.sh

@@ -30 +30 @@
 #}}}
 
-
+#Install ISSM
 #Determinig Installation type depending on svn changes{{{
 echo "======================================================";
@@ -45 +45 @@
         wget http://ross.ics.uci.edu:8080/job/$JOB_NAME/$BUILD_NUMBER/changes > /dev/null 2>&1
 
-        #Process html page and get the list of files that has changed
-        cat changes | grep "The file was modified" | sed -e 's/.*<\/a><\/td><td>\(.*\)<\/td><\/tr><\/table>.*/\1/' > $ISSM_DIR/TEMP
-        cat $ISSM_DIR/TEMP
+        #Process html page and get the list of files that has changed (tricky...)
+
+        cat changes | grep 'alt="The file was modified"' |sed -e 's/alt="The file was modified"/\
+                #/g' | sed -e 's/.*<\/a><\/td><td>\(.*\)<\/td><\/tr>.*/\1/' | grep -v '"The file was modified"' > $ISSM_DIR/TEMP
+        if [ -z "$(cat $ISSM_DIR/TEMP)" ] ; then
+                echo "ERROR: file list is empty!"
+        fi
 
         #Do we need to reinstall externalpackages?
@@ -88 +92 @@
 echo $SVN_REVISION_1 > $ISSM_DIR/svn_revision_old
 #}}}
-
 #install/none external packages    (ISSM_EXTERNALPACKAGES){{{
 if [ "$ISSM_EXTERNALPACKAGES" == "install" ]

issm/trunk-jpl/jenkins/linux64_murdo

@@ -31 +31 @@
 MATLAB_TEST=1
 PYTHON_TEST=1
-
-#execution path used for parallel runs
-EXECUTION_PATH=$ISSM_DIR/execution
-
-#repo:
-REPOSITORY="https://issm.ess.uci.edu/svn/issm/issm/trunk-jpl"
 
 #-----------------------------------#

issm/trunk-jpl/jenkins/macosx_pine-island

@@ -25 +25 @@
 MATLAB_TEST=1
 PYTHON_TEST=0
-
-#execution path used for parallel runs
-EXECUTION_PATH=$ISSM_DIR/execution
-
-#repo:
-REPOSITORY="https://issm.ess.uci.edu/svn/issm/issm/trunk-jpl"
 
 #-----------------------------------#