Changeset 25977

Timestamp:

02/03/21 21:00:43 (4 years ago)

Author:

jdquinn

Message:

CHG: New install script; clean up

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) (4 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_DIR}/externalpackages/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

@@ -432 +432 @@
 #{{{
 cd $ISSM_DIR/nightlylog/
-source $ISSM_DIR/externalpackages/shell2junit/install/sh2ju.sh
+source $ISSM_DIR/externalpackages/shell2junit/install/bin/sh2ju.sh
 juLogClean
 
@@ -442 +442 @@
         #look through numtests:
         for i in `echo $testlist`; do
-                juLog -test=MATLAB-$i -name=Error -error=ERROR awk "/starting:$i/{flag=1;next}/finished/{flag=0} flag{print}" matlab_log.log
-                juLog -test=MATLAB-$i -name=Failure -error=FAILURE awk "/starting:$i/{flag=1;next}/finished/{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
 
@@ -468 +468 @@
         #look through numtests:
         for i in `echo $testlist`; do
-                juLog -test=PYTHON-$i -name=Error -error=ERROR awk "/starting:$i/{flag=1;next}/finished/{flag=0} flag{print}" python_log.log
-                juLog -test=PYTHON-$i -name=Failure -error=FAILURE awk "/starting:$i/{flag=1;next}/finished/{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
 
@@ -495 +495 @@
 
         for i in `echo $testlist`; do
-                juLog -test=Example-$i -name=Error -error=ERROR awk "/starting: $i/{flag=1;next}/finished: $i/{flag=0} flag{print}" matlab_log_examples.log
-                juLog -test=Example-$i -name=Failure -error=FAILURE awk "/starting: $i/{flag=1;next}/finished: $i/{flag=0} flag{print}" matlab_log_examples.log
+                juLog -test=Example-$i -name=Error -error=ERROR awk "/^starting: ${i}$/{flag=1;next}/^finished: ${i}$/{flag=0} flag{print}" matlab_log_examples.log
+                juLog -test=Example-$i -name=Failure -error=FAILURE awk "/^starting: ${i}$/{flag=1;next}/^finished: ${i}$/{flag=0} flag{print}" matlab_log_examples.log
         done