Author: nickboldt Date: 2011-06-15 02:56:27 -0400 (Wed, 15 Jun 2011) New Revision: 32114 Modified: branches/jbosstools-3.2.x/build/publish.sh Log: backport changes to publish.sh from trunk Modified: branches/jbosstools-3.2.x/build/publish.sh =================================================================== --- branches/jbosstools-3.2.x/build/publish.sh 2011-06-15 06:44:07 UTC (rev 32113) +++ branches/jbosstools-3.2.x/build/publish.sh 2011-06-15 06:56:27 UTC (rev 32114) @@ -8,6 +8,9 @@ # where to create the stuff to publish STAGINGDIR=${WORKSPACE}/results/${JOB_NAME} +# for trunk, use "trunk" or "trunk/soa" instead of generated path from job name +PUBLISHPATHSUFFIX=""; if [[ $1 ]]; then PUBLISHPATHSUFFIX="$1"; fi + # https://jira.jboss.org/browse/JBIDE-6956 "jbosstools-3.2.0.M2" is too verbose, use "3.2.0.M2" instead JOBNAMEREDUX=${JOB_NAME/.aggregate}; JOBNAMEREDUX=${JOBNAMEREDUX/jbosstools-} @@ -216,7 +219,8 @@ RESULTS_DIR=${buildxml/\/build.xml/} fi done -if [[ ${ANT_SCRIPT} ]] && [[ -f ${ANT_SCRIPT} ]]; then ant -f ${ANT_SCRIPT} ${ANT_PARAMS}; fi +ANT_TARGET="buildResults.single"; if [[ ${JOB_NAME/.aggregate} != ${JOB_NAME} ]]; then ANT_TARGET="buildResults.aggregate"; fi +if [[ ${ANT_SCRIPT} ]] && [[ -f ${ANT_SCRIPT} ]]; then ant -f ${ANT_SCRIPT} ${ANT_TARGET} ${ANT_PARAMS}; fi # copy buildResults.css, buildResults.html to ${STAGINGDIR}/logs if [[ ${RESULTS_DIR} ]] && [[ -d ${RESULTS_DIR} ]]; then @@ -261,9 +265,9 @@ # if an aggregate build, put output elsewhere on disk if [[ ${JOB_NAME/.aggregate} != ${JOB_NAME} ]]; then echo "<meta http-equiv=\"refresh\" content=\"0;url=${BUILD_ID}-H${BUILD_NUMBER}/\">" > /tmp/latestBuild.html - if [[ $1 == "trunk" ]]; then - date; rsync -arzq --delete ${STAGINGDIR}/* $DESTINATION/builds/nightly/trunk/${BUILD_ID}-H${BUILD_NUMBER}/ - date; rsync -arzq --delete /tmp/latestBuild.html $DESTINATION/builds/nightly/trunk/ + if [[ ${PUBLISHPATHSUFFIX} ]]; then + date; rsync -arzq --delete ${STAGINGDIR}/* $DESTINATION/builds/nightly/${PUBLISHPATHSUFFIX}/${BUILD_ID}-H${BUILD_NUMBER}/ + date; rsync -arzq --delete /tmp/latestBuild.html $DESTINATION/builds/nightly/${PUBLISHPATHSUFFIX}/ else date; rsync -arzq --delete /tmp/latestBuild.html $DESTINATION/builds/nightly/${JOBNAMEREDUX}/ date; rsync -arzq --delete ${STAGINGDIR}/* $DESTINATION/builds/nightly/${JOBNAMEREDUX}/${BUILD_ID}-H${BUILD_NUMBER}/ @@ -286,8 +290,8 @@ # extra publish step for aggregate update sites ONLY if [[ ${JOB_NAME/.aggregate} != ${JOB_NAME} ]]; then - if [[ $1 == "trunk" ]]; then - date; rsync -arzq --delete ${STAGINGDIR}/all/repo/* $DESTINATION/updates/nightly/trunk/ + if [[ ${PUBLISHPATHSUFFIX} ]]; then + date; rsync -arzq --delete ${STAGINGDIR}/all/repo/* $DESTINATION/updates/nightly/${PUBLISHPATHSUFFIX}/ else date; rsync -arzq --delete ${STAGINGDIR}/all/repo/* $DESTINATION/updates/nightly/${JOBNAMEREDUX}/ fi