3:40 a.m.
Author: nickboldt
Date: 2011-01-27 21:40:14 -0500 (Thu, 27 Jan 2011)
New Revision: 28689
Modified:
branches/jbosstools-3.2.x/build/publish.sh
Log:
collect aggregate metadata in aggregate build (backport from trunk)
Modified: branches/jbosstools-3.2.x/build/publish.sh
===================================================================
--- branches/jbosstools-3.2.x/build/publish.sh 2011-01-28 02:40:03 UTC (rev 28688)
+++ branches/jbosstools-3.2.x/build/publish.sh 2011-01-28 02:40:14 UTC (rev 28689)
@@ -50,36 +50,18 @@
# 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}
+rm -fr ${bl}; wget -q
http://hudson.qa.jboss.com/hudson/job/${JOB_NAME}/${BUILD_NUMBER}/console... -O ${bl}
--timeout=900 --wait=10 --random-wait --tries=10 --retry-connrefused
--no-check-certificate
-# 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
+# JBDS-1361 - fetch XML and then sed it into plain text
+rl=${STAGINGDIR}/logs/SVN_REVISION
+rm -f ${rl}.txt ${rl}.xml; wget -O ${rl}.xml
"http://hudson.qa.jboss.com/hudson/job/${JOB_NAME}/api/xml?wrapper=changeSet&depth=1&xpath=//build[1]/changeSet/revision"
--timeout=900 --wait=10 --random-wait --tries=30 --retry-connrefused
--no-check-certificate --server-response
+sed -e
"s#<module>\(http[^<>]\+\)</module><revision>\([0-9]\+\)</revision>#\1\@\2\n#g"
${rl}.xml | sed -e "s#<[^<>]\+>##g" > ${rl}.txt
-# convert input above to:
-# http://anonsvn.jboss.org/repos/tdesigner/branches/7.1@1063
-# http://anonsvn.jboss.org/repos/jbosstools/trunk/build@25503
-# https://svn.jboss.org/repos/jbosstools/branches/jbosstools-3.2.0.Beta1@25538
-sed -ne "/Updating \(http.\+\)\|Checking out \(http.\+\)\|At revision \([0-9]\+\)/
p" ${bl} | \
- sed -e "/At revision/ s/At revision /\@/" | sed -e N -e '/http/
s/\n//' | \
- sed -e "/Checking out\|Updating/,+1 s/\(Checking out \|Updating
\)\(.\+\)/\2/g" > ${rl}
METAFILE="${BUILD_ID}-H${BUILD_NUMBER}.txt"
-if [[ ${SVN_REVISION} ]]; then
- METAFILE="${BUILD_ID}-H${BUILD_NUMBER}-r${SVN_REVISION}.txt"
- echo "SVN_REVISION = ${SVN_REVISION}" > ${STAGINGDIR}/logs/${METAFILE}
-else
- echo -n "" > ${STAGINGDIR}/logs/${METAFILE}
-fi
+touch ${STAGINGDIR}/logs/${METAFILE}
+METAFILE=build.properties
+
echo "JOB_NAME = ${JOB_NAME}" >> ${STAGINGDIR}/logs/${METAFILE}
echo "BUILD_NUMBER = ${BUILD_NUMBER}" >> ${STAGINGDIR}/logs/${METAFILE}
echo "BUILD_ID = ${BUILD_ID}" >> ${STAGINGDIR}/logs/${METAFILE}
@@ -87,7 +69,6 @@
echo "HUDSON_SLAVE = $(uname -a)" >> ${STAGINGDIR}/logs/${METAFILE}
echo "RELEASE = ${RELEASE}" >> ${STAGINGDIR}/logs/${METAFILE}
echo "ZIPSUFFIX = ${ZIPSUFFIX}" >> ${STAGINGDIR}/logs/${METAFILE}
-cp ${STAGINGDIR}/logs/${METAFILE} ${STAGINGDIR}/logs/build.properties
#echo "$z ..."
if [[ $z != "" ]] && [[ -f $z ]] ; then
@@ -153,6 +134,8 @@
popd
z=${STAGINGDIR}/all/${srczipname}; for m in $(md5sum ${z}); do if [[ $m != ${z} ]]; then
echo $m > ${z}.MD5; fi; done
+mkdir -p ${STAGINGDIR}/logs
+
# collect component zips from upstream aggregated build jobs
if [[ ${JOB_NAME/.aggregate} != ${JOB_NAME} ]] && [[ -d
${WORKSPACE}/sources/aggregate/site/zips ]]; then
mkdir -p ${STAGINGDIR}/components
@@ -178,11 +161,15 @@
rm -fr ${STAGINGDIR}/all/sources
z=${STAGINGDIR}/all/${SRCSNAME}; for m in $(md5sum ${z}); do if [[ $m != ${z} ]]; then
echo $m > ${z}.MD5; fi; done
+
+ # JBIDE-7444 get aggregate metadata xml properties file
+ if [[ -f ${WORKSPACE}/sources/aggregate/site/zips/build.properties.all.xml ]]; then
+ rsync -aq ${WORKSPACE}/sources/aggregate/site/zips/build.properties.all.xml
${STAGINGDIR}/logs/
+ fi
fi
# generate list of zips in this job
METAFILE=zip.list.txt
-mkdir -p ${STAGINGDIR}/logs
echo "ALL_ZIPS = \\" >> ${STAGINGDIR}/logs/${METAFILE}
for z in $(find ${STAGINGDIR} -name "*Update*.zip") $(find ${STAGINGDIR} -name
"*Sources*.zip"); do
# list zips in staging dir
@@ -191,7 +178,7 @@
echo "" >> ${STAGINGDIR}/logs/${METAFILE}
# generate md5sums in a single file
-md5sumsFile=${STAGINGDIR}/logs/${JOB_NAME}-md5sums-${BUILD_ID}-H${BUILD_NUMBER}.txt
+md5sumsFile=${STAGINGDIR}/logs/md5sums.txt
echo "# Update Site Zips" > ${md5sumsFile}
echo "# ----------------" >> ${md5sumsFile}
md5sum $(find . -name "*Update*.zip" | egrep -v
"aggregate-Sources|nightly-Update") >> ${md5sumsFile}
@@ -201,6 +188,7 @@
md5sum $(find . -name "*Source*.zip" | egrep -v
"aggregate-Sources|nightly-Update") >> ${md5sumsFile}
echo " " >> ${md5sumsFile}
+# TODO: JBIDE-7045 this is obsolete - replace it with xslt'd transform of
build.properties.all.xml (agg site overall metadata)
# generate HTML snippet, download-snippet.html, for inclusion on jboss.org
mkdir -p ${STAGINGDIR}/logs
ANT_PARAMS=" -DZIPSUFFIX=${ZIPSUFFIX} -DJOB_NAME=${JOB_NAME}
-Dinput.dir=${STAGINGDIR} -Doutput.dir=${STAGINGDIR}/logs -DWORKSPACE=${WORKSPACE}"
@@ -286,6 +274,7 @@
# publish updated log
bl=${STAGINGDIR}/logs/BUILDLOG.txt
-wget -q http://hudson.qa.jboss.com/hudson/job/${JOB_NAME}/${BUILD_NUMBER}/console... -O
${bl}
+rm -fr ${bl}; wget -q
http://hudson.qa.jboss.com/hudson/job/${JOB_NAME}/${BUILD_NUMBER}/console... -O ${bl}
--timeout=900 --wait=10 --random-wait --tries=10 --retry-connrefused
--no-check-certificate
+
date; rsync -arzq --delete ${STAGINGDIR}/logs $DESTINATION/builds/staging/${JOB_NAME}/
Property changes on: branches/jbosstools-3.2.x/build/publish.sh
___________________________________________________________________
Name: svn:executable
+ *