Author: nickboldt Date: 2010-09-01 16:05:22 -0400 (Wed, 01 Sep 2010) New Revision: 24626 Modified: trunk/build/publish.sh Log: https://jira.jboss.org/browse/JBIDE-6969 aggr builds should now be in nightly/{trunk,jbosstools-3.2.0.x}/${timestamp-hudsonID}/, whereas everything else should be in 3.2.helios/ until I come up with a better dir name like "UPSTREAM" or "COMPONENTS" Modified: trunk/build/publish.sh =================================================================== --- trunk/build/publish.sh 2010-09-01 19:12:32 UTC (rev 24625) +++ trunk/build/publish.sh 2010-09-01 20:05:22 UTC (rev 24626) @@ -8,7 +8,6 @@ # releases get named differently than snapshots if [[ ${RELEASE} == "Yes" ]]; then ZIPSUFFIX="${BUILD_ID}-H${BUILD_NUMBER}" - STAGINGDIR=${WORKSPACE}/results/${JOB_NAME}-${ZIPSUFFIX} else ZIPSUFFIX="SNAPSHOT" fi @@ -161,10 +160,23 @@ if [[ $ec == "0" ]] && [[ $fc == "0" ]]; then # publish build dir (including update sites/zips/logs/metadata if [[ -d ${STAGINGDIR} ]]; then - date; rsync -arzq --delete ${STAGINGDIR} $DESTINATION/builds/nightly/3.2.helios/; # create a new unique dir - if [[ ${RELEASE} == "Yes" ]]; then - date; rsync -arzq --delete ${STAGINGDIR} $DESTINATION/builds/nightly/3.2.helios/${JOB_NAME} # replace existing snapshot dir + + # if an aggregate build, put output elsewhere on disk + if [[ ${JOB_NAME/.aggregate} != ${JOB_NAME} ]]; then + if [[ $1 == "trunk" ]]; then + date; rsync -arzq --delete ${STAGINGDIR}/* $DESTINATION/builds/nightly/trunk/${BUILD_ID}-H${BUILD_NUMBER}/ + else + date; rsync -arzq --delete ${STAGINGDIR}/* $DESTINATION/builds/nightly/${JOB_NAME/.aggregate}/${BUILD_ID}-H${BUILD_NUMBER}/ + fi + else + # if a release build, create a named dir + if [[ ${RELEASE} == "Yes" ]]; then + date; rsync -arzq --delete ${STAGINGDIR}/* $DESTINATION/builds/nightly/3.2.helios/${JOB_NAME}-${ZIPSUFFIX}/ + fi fi + + # and create/replace a snapshot dir w/ static URL + date; rsync -arzq --delete ${STAGINGDIR} $DESTINATION/builds/nightly/3.2.helios/ fi # extra publish step for aggregate update sites ONLY @@ -182,4 +194,3 @@ if [[ -d ${WORKSPACE}/m2-repo/org/jboss/tools ]]; then rm -rf ${WORKSPACE}/m2-repo/org/jboss/tools fi -