Author: nickboldt Date: 2010-09-08 22:15:46 -0400 (Wed, 08 Sep 2010) New Revision: 24825 Modified: trunk/build/aggregate/site/build.xml trunk/build/aggregate/site/pom.xml trunk/build/parent/pom.xml trunk/build/publish.sh Log: https://jira.jboss.org/browse/JBIDE-6956 move from nightly/3.2.helios/ into staging/ Modified: trunk/build/aggregate/site/build.xml =================================================================== --- trunk/build/aggregate/site/build.xml 2010-09-08 22:08:53 UTC (rev 24824) +++ trunk/build/aggregate/site/build.xml 2010-09-09 02:15:46 UTC (rev 24825) @@ -173,7 +173,7 @@ </copy> </target> - <!-- look for http://download.jboss.org/jbosstools/builds/nightly/3.2.helios/jbosstools...; + <!-- look for http://download.jboss.org/jbosstools/builds/staging/jbosstools-3.2.0.M2.c...; if found, load file and use ${ALL_ZIPS} to get list of relative path zips to fetch --> <target name="collect.zips" description="collect zips from the sites we aggregated"> <property name="aggegate.zips.dir" value="${output.dir}/zips" /> Modified: trunk/build/aggregate/site/pom.xml =================================================================== --- trunk/build/aggregate/site/pom.xml 2010-09-08 22:08:53 UTC (rev 24824) +++ trunk/build/aggregate/site/pom.xml 2010-09-09 02:15:46 UTC (rev 24825) @@ -16,10 +16,10 @@ <properties> <!-- add more inputRepo# here, then reference below; need variables so that these can be referred to in Ant script later --> - <inputRepo1>http://download.jboss.org/jbosstools/builds/nightly/3.2.hel... - <inputRepo2>http://download.jboss.org/jbosstools/builds/nightly/3.2.hel... - <inputRepo3>http://download.jboss.org/jbosstools/builds/nightly/3.2.hel... - <inputRepo4>http://download.jboss.org/jbosstools/builds/nightly/3.2.hel... + <inputRepo1>http://download.jboss.org/jbosstools/builds/staging/jbossto... + <inputRepo2>http://download.jboss.org/jbosstools/builds/staging/jbossto... + <inputRepo3>http://download.jboss.org/jbosstools/builds/staging/jbossto... + <inputRepo4>http://download.jboss.org/jbosstools/builds/staging/jbossto... <inputRepos>1,2,3,4</inputRepos> </properties> Modified: trunk/build/parent/pom.xml =================================================================== --- trunk/build/parent/pom.xml 2010-09-08 22:08:53 UTC (rev 24824) +++ trunk/build/parent/pom.xml 2010-09-09 02:15:46 UTC (rev 24825) @@ -254,7 +254,7 @@ </repository> <repository> <id>jboss-drools-nightly</id> - <url>http://download.jboss.org/jbosstools/builds/nightly/3.2.helios/jbo... + <url>http://download.jboss.org/jbosstools/builds/staging/jbosstools-dro... </url> <layout>p2</layout> <snapshots> Modified: trunk/build/publish.sh =================================================================== --- trunk/build/publish.sh 2010-09-08 22:08:53 UTC (rev 24824) +++ trunk/build/publish.sh 2010-09-09 02:15:46 UTC (rev 24825) @@ -126,7 +126,7 @@ mkdir -p ${STAGINGDIR}/logs ANT_PARAMS="-v -DZIPSUFFIX=${ZIPSUFFIX} -DJOB_NAME=${JOB_NAME} -Dinput.dir=${STAGINGDIR} -Doutput.dir=${STAGINGDIR}/logs -DWORKSPACE=${WORKSPACE}" if [[ ${JOB_NAME/.aggregate} != ${JOB_NAME} ]]; then # reuse snippet from upstream build - ANT_PARAMS="${ANT_PARAMS} -Dtemplate.file=http://download.jboss.org/jbosstools/builds/nightly/3.2.helios/${JOB_NAME/.aggregate/.continuous}/logs/download-snippet.txt" + ANT_PARAMS="${ANT_PARAMS} -Dtemplate.file=http://download.jboss.org/jbosstools/builds/staging/${JOB_NAME/.aggregate/.continuous}/logs/download-snippet.txt" fi for buildxml in ${WORKSPACE}/build/results/build.xml ${WORKSPACE}/sources/build/results/build.xml ${WORKSPACE}/sources/results/build.xml; do if [[ -f ${buildxml} ]]; then @@ -181,12 +181,12 @@ 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}/ + date; rsync -arzq --delete ${STAGINGDIR}/* $DESTINATION/builds/staging/${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/ + date; rsync -arzq --delete ${STAGINGDIR} $DESTINATION/builds/staging/ fi # extra publish step for aggregate update sites ONLY