Changeset 25979

Timestamp:

02/04/21 13:34:08 (4 years ago)

Author:

jdquinn

Message:

BUG: Fix for shell2junit updates

Location:

issm/trunk-jpl

Files:

• externalpackages/shell2junit/README (deleted)
• externalpackages/shell2junit/install.sh (modified) (1 diff)
• externalpackages/shell2junit/install.sh.old (deleted)
• externalpackages/shell2junit/patch (deleted)
• externalpackages/shell2junit/shell2junit-1.0.0.zip (deleted)
• jenkins/jenkins.sh (modified) (3 diffs)

issm/trunk-jpl/externalpackages/shell2junit/install.sh

@@ -3 +3 @@
 
 
-#Some cleanup
-rm -rf install 
-mkdir install 
+## Constants
+#
+VER="1.0.0"
 
-cp patch/sh2ju.sh install/
+PREFIX="${ISSM_EXT_DIR}/shell2junit/install" # Set to location where external package should be installed
+
+# Cleanup
+rm -rf ${PREFIX}
+mkdir -p ${PREFIX}/bin
+
+# Download source
+$ISSM_DIR/scripts/DownloadExternalPackage.sh "https://issm.ess.uci.edu/files/externalpackages/shell2junit-${VER}.zip" "shell2junit-${VER}.zip"
+
+# Unpack source
+unzip -q shell2junit-${VER}.zip
+
+# Install
+mv shell2junit-${VER}/sh2ju.sh ${PREFIX}/bin
+
+# Cleanup
+rm -rf shell2junit-${VER}

issm/trunk-jpl/jenkins/jenkins.sh

@@ -431 +431 @@
 #process logs to be junit compatible
 #{{{
-cd $ISSM_DIR/nightlylog/
-source $ISSM_DIR/externalpackages/shell2junit/install/bin/sh2ju.sh
+cd $ISSM_DIR/nightlylog
+source $ISSM_EXT_DIR/shell2junit/install/bin/sh2ju.sh
 juLogClean
 
@@ -440 +440 @@
         testlist=`cat matlab_log.log | grep "\-\-\-\-\-\-\-\-starting" | sed 's/----------------starting://g' | sed 's/-//g'`
 
-        #look through numtests:
+        # NOTE: Matching pattern is "----------------starting:<TEST_NUM>-". Note trailing hyphen, which guards against greedy matching of, for example, "2010" when searching for "201".
         for i in `echo $testlist`; do
-                juLog -test=MATLAB-$i -name=Error -error=ERROR awk "/^starting:${i}$/{flag=1;next}/^finished:${i}$/{flag=0} flag{print}" matlab_log.log
-                juLog -test=MATLAB-$i -name=Failure -error=FAILURE awk "/^starting:${i}$/{flag=1;next}/^finished:${i}$/{flag=0} flag{print}" matlab_log.log
+                juLog -test=MATLAB-$i -name=Error -error=ERROR awk "/starting:${i}-/{flag=1;next}/finished:${i}-/{flag=0} flag{print}" matlab_log.log
+                juLog -test=MATLAB-$i -name=Failure -error=FAILURE awk "/starting:${i}-/{flag=1;next}/finished:${i}-/{flag=0} flag{print}" matlab_log.log
         done
 
@@ -466 +466 @@
         testlist=`cat python_log.log | grep "\-\-\-\-\-\-\-\-starting" | sed 's/----------------starting://g' | sed 's/-//g'`
 
-        #look through numtests:
+        # NOTE: Matching pattern is "----------------starting:<TEST_NUM>-". Note trailing hyphen, which guards against greedy matching of, for example, "2010" when searching for "201".
         for i in `echo $testlist`; do
-                juLog -test=PYTHON-$i -name=Error -error=ERROR awk "/^starting:${i}$/{flag=1;next}/^finished:${i}$/{flag=0} flag{print}" python_log.log
-                juLog -test=PYTHON-$i -name=Failure -error=FAILURE awk "/^starting:${i}$/{flag=1;next}/^finished:${i}$/{flag=0} flag{print}" python_log.log
+                juLog -test=PYTHON-$i -name=Error -error=ERROR awk "/starting:${i}-/{flag=1;next}/finished:${i}-/{flag=0} flag{print}" python_log.log
+                juLog -test=PYTHON-$i -name=Failure -error=FAILURE awk "/starting:${i}-/{flag=1;next}/finished:${i}-/{flag=0} flag{print}" python_log.log
         done