Author: nickboldt
Date: 2010-10-07 11:30:27 -0400 (Thu, 07 Oct 2010)
New Revision: 25567
Modified:
trunk/build/publish.sh
Log:
collect SVN paths and revisions into new SVN_REVISION.txt file
Modified: trunk/build/publish.sh
===================================================================
--- trunk/build/publish.sh 2010-10-07 15:14:16 UTC (rev 25566)
+++ trunk/build/publish.sh 2010-10-07 15:30:27 UTC (rev 25567)
@@ -48,6 +48,23 @@
# note the job name, build number, SVN rev, and build ID of the latest snapshot zip
mkdir -p ${STAGINGDIR}/logs
+bl=${STAGINGDIR}/logs/BUILDLOG.txt
+wget -q
http://hudson.qa.jboss.com/hudson/job/${JOB_NAME}/${BUILD_NUMBER}/console... -O
${bl}
+
+# JBDS-1361 - instead of SVN_REVISION, scrape ${bl} (BUILDLOG.txt)
+# Updating
http://anonsvn.jboss.org/repos/tdesigner/branches/7.1
+# ...
+# At revision 1063
+# Updating
http://anonsvn.jboss.org/repos/jbosstools/trunk/build
+# ...
+# At revision 25503
+# -- or --
+# Checking out
https://svn.jboss.org/repos/jbosstools/branches/jbosstools-3.2.0.Beta1
+# ...
+# At revision 25538
+rl=${STAGINGDIR}/logs/SVN_REVISION.txt
+sed -ne "/Updating http.\+\|Checking out http.\+\|At revision \d\+/ p" ${bl}
" > ${rl}
+
METAFILE="${BUILD_ID}-H${BUILD_NUMBER}.txt"
if [[ ${SVN_REVISION} ]]; then
METAFILE="${BUILD_ID}-H${BUILD_NUMBER}-r${SVN_REVISION}.txt"
@@ -136,10 +153,9 @@
ant -f ${ANT_SCRIPT} ${ANT_PARAMS}
fi
-# get full build log and filter out Maven test failures
+# ${bl} is full build log; see above
mkdir -p ${STAGINGDIR}/logs
-bl=${STAGINGDIR}/logs/BUILDLOG.txt
-wget -q
http://hudson.qa.jboss.com/hudson/job/${JOB_NAME}/${BUILD_NUMBER}/console... -O
${bl}
+# filter out Maven test failures
fl=${STAGINGDIR}/logs/FAIL_LOG.txt
# ignore warning lines and checksum failures
sed -ne "/\[WARNING\]\|CHECKSUM FAILED/ ! p" ${bl} | sed -ne
"/<<< FAI/,+9 p" | sed -e "/AILURE/,+9
s/\(.\+AILURE.\+\)/\n----------\n\n\1/g" > ${fl}