Author: nickboldt Date: 2011-08-30 13:12:57 -0400 (Tue, 30 Aug 2011) New Revision: 34394 Modified: branches/jbosstools-3.2.x/build/publish.sh branches/jbosstools-3.2.x/build/publishComponentZipToStaging.sh branches/jbosstools-3.2.x/build/publishUpdateZipToStaging.sh Log: merge changes from trunk re: symlinks and protocol=28 Modified: branches/jbosstools-3.2.x/build/publish.sh =================================================================== --- branches/jbosstools-3.2.x/build/publish.sh 2011-08-30 17:12:45 UTC (rev 34393) +++ branches/jbosstools-3.2.x/build/publish.sh 2011-08-30 17:12:57 UTC (rev 34394) @@ -266,36 +266,40 @@ if [[ ${JOB_NAME/.aggregate} != ${JOB_NAME} ]]; then echo "<meta http-equiv=\"refresh\" content=\"0;url=${BUILD_ID}-H${BUILD_NUMBER}/\">" > /tmp/latestBuild.html if [[ ${PUBLISHPATHSUFFIX} ]]; then - date; rsync -arzq --delete ${STAGINGDIR}/* $DESTINATION/builds/nightly/${PUBLISHPATHSUFFIX}/${BUILD_ID}-H${BUILD_NUMBER}/ - echo -e "rm latest\nln ${BUILD_ID}-H${BUILD_NUMBER} latest" | sftp ${DESTINATION}/builds/nightly/${PUBLISHPATHSUFFIX}/ - date; rsync -arzq --delete /tmp/latestBuild.html $DESTINATION/builds/nightly/${PUBLISHPATHSUFFIX}/ + date; rsync -arzq --protocol=28 --delete ${STAGINGDIR}/* $DESTINATION/builds/nightly/${PUBLISHPATHSUFFIX}/${BUILD_ID}-H${BUILD_NUMBER}/ + # sftp only works with user@server, not with local $DESTINATIONS, so use rsync to push symlink instead + # echo -e "rm latest\nln ${BUILD_ID}-H${BUILD_NUMBER} latest" | sftp ${DESTINATIONREDUX}/builds/nightly/${PUBLISHPATHSUFFIX}/ + pushd /tmp >/dev/null; ln -s ${BUILD_ID}-H${BUILD_NUMBER} latest; rsync -l latest ${DESTINATION}/builds/nightly/${PUBLISHPATHSUFFIX}/; rm -f latest; popd >/dev/null + date; rsync -arzq --protocol=28 --delete /tmp/latestBuild.html $DESTINATION/builds/nightly/${PUBLISHPATHSUFFIX}/ else - date; rsync -arzq --delete /tmp/latestBuild.html $DESTINATION/builds/nightly/${JOBNAMEREDUX}/ - echo -e "rm latest\nln ${BUILD_ID}-H${BUILD_NUMBER} latest" | sftp ${DESTINATION}/builds/nightly/${JOBNAMEREDUX}/ - date; rsync -arzq --delete ${STAGINGDIR}/* $DESTINATION/builds/nightly/${JOBNAMEREDUX}/${BUILD_ID}-H${BUILD_NUMBER}/ + date; rsync -arzq --protocol=28 --delete /tmp/latestBuild.html $DESTINATION/builds/nightly/${JOBNAMEREDUX}/ + # sftp only works with user@server, not with local $DESTINATIONS, so use rsync to push symlink instead + # echo -e "rm latest\nln ${BUILD_ID}-H${BUILD_NUMBER} latest" | sftp ${DESTINATIONREDUX}/builds/nightly/${JOBNAMEREDUX}/ + pushd /tmp >/dev/null; ln -s ${BUILD_ID}-H${BUILD_NUMBER} latest; rsync -l latest ${DESTINATION}/builds/nightly/${JOBNAMEREDUX}/; rm -f latest; popd >/dev/null + date; rsync -arzq --protocol=28 --delete ${STAGINGDIR}/* $DESTINATION/builds/nightly/${JOBNAMEREDUX}/${BUILD_ID}-H${BUILD_NUMBER}/ fi rm -f /tmp/latestBuild.html #else # COMMENTED OUT as this uses too much disk space # if a release build, create a named dir #if [[ ${RELEASE} == "Yes" ]]; then - # date; rsync -arzq --delete ${STAGINGDIR}/* $DESTINATION/builds/staging/${JOB_NAME}-${ZIPSUFFIX}/ + # date; rsync -arzq --protocol=28 --delete ${STAGINGDIR}/* $DESTINATION/builds/staging/${JOB_NAME}-${ZIPSUFFIX}/ #fi fi # and create/replace a snapshot dir outside Hudson which is file:// accessible - date; rsync -arzq --delete ${STAGINGDIR} $INTRNALDEST/builds/staging/ + date; rsync -arzq --delete ${STAGINGDIR}/* $INTRNALDEST/builds/staging/${JOB_NAME}.next # and create/replace a snapshot dir w/ static URL - date; rsync -arzq --delete ${STAGINGDIR} $DESTINATION/builds/staging/ + date; rsync -arzq --protocol=28 --delete ${STAGINGDIR}/* $DESTINATION/builds/staging/${JOB_NAME}.next fi # extra publish step for aggregate update sites ONLY if [[ ${JOB_NAME/.aggregate} != ${JOB_NAME} ]]; then if [[ ${PUBLISHPATHSUFFIX} ]]; then - date; rsync -arzq --delete ${STAGINGDIR}/all/repo/* $DESTINATION/updates/nightly/${PUBLISHPATHSUFFIX}/ + date; rsync -arzq --protocol=28 --delete ${STAGINGDIR}/all/repo/* $DESTINATION/updates/nightly/${PUBLISHPATHSUFFIX}/ else - date; rsync -arzq --delete ${STAGINGDIR}/all/repo/* $DESTINATION/updates/nightly/${JOBNAMEREDUX}/ + date; rsync -arzq --protocol=28 --delete ${STAGINGDIR}/all/repo/* $DESTINATION/updates/nightly/${JOBNAMEREDUX}/ fi fi fi @@ -309,6 +313,6 @@ # publish updated log bl=${STAGINGDIR}/logs/BUILDLOG.txt rm -f ${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}/ +date; rsync -arzq --protocol=28 --delete ${STAGINGDIR}/logs $DESTINATION/builds/staging/${JOB_NAME}/ date; rsync -arzq --delete ${STAGINGDIR}/logs $INTRNALDEST/builds/staging/${JOB_NAME}/ Modified: branches/jbosstools-3.2.x/build/publishComponentZipToStaging.sh =================================================================== --- branches/jbosstools-3.2.x/build/publishComponentZipToStaging.sh 2011-08-30 17:12:45 UTC (rev 34393) +++ branches/jbosstools-3.2.x/build/publishComponentZipToStaging.sh 2011-08-30 17:12:57 UTC (rev 34394) @@ -34,12 +34,12 @@ #echo "Fetch ${path} as ${targetZip}" # to test locally, may need to use --protocol=29 and -P instead of -q - date; rsync -arzq --rsh=ssh ${DESTINATION}/builds/staging/${JOBNAMEREDUX}/${path} ${targetZip} + date; rsync -arzq --rsh=ssh --protocol=28 ${DESTINATION}/builds/staging/${JOBNAMEREDUX}/${path} ${targetZip} # generate MD5 sums for each zip for m in $(md5sum ${targetZip}); do if [[ $m != ${targetZip} ]]; then echo $m > ${targetZip}.MD5; fi; done #echo "Publish ${path} as ${targetZip}" # to test locally, may need to use --protocol=29 and -P instead of -q - date; rsync -arzq --rsh=ssh ${targetZip} ${targetZip}.MD5 ${DESTINATION}/updates/staging/$BRANCH/ + date; rsync -arzq --rsh=ssh --protocol=28 ${targetZip} ${targetZip}.MD5 ${DESTINATION}/updates/staging/$BRANCH/ done Modified: branches/jbosstools-3.2.x/build/publishUpdateZipToStaging.sh =================================================================== --- branches/jbosstools-3.2.x/build/publishUpdateZipToStaging.sh 2011-08-30 17:12:45 UTC (rev 34393) +++ branches/jbosstools-3.2.x/build/publishUpdateZipToStaging.sh 2011-08-30 17:12:57 UTC (rev 34394) @@ -20,11 +20,11 @@ targetZip="${JOBNAMEREDUX}-Update.zip" #echo "Fetch ${path} as ${targetZip}" # to test locally, may need to use --protocol=29 and -P instead of -q -date; rsync -arzq --rsh=ssh ${DESTINATION}/builds/staging/${JOBNAMEREDUX}/${path} ${targetZip} +date; rsync -arzq --rsh=ssh --protocol=28 ${DESTINATION}/builds/staging/${JOBNAMEREDUX}/${path} ${targetZip} # generate MD5 sum for each zip for m in $(md5sum ${targetZip}); do if [[ $m != ${targetZip} ]]; then echo $m > ${targetZip}.MD5; fi; done #echo "Publish ${path} as ${targetZip}" # to test locally, may need to use --protocol=29 and -P instead of -q -date; rsync -arzq --rsh=ssh ${targetZip} ${targetZip}.MD5 ${DESTINATION}/updates/staging/ +date; rsync -arzq --rsh=ssh --protocol=28 ${targetZip} ${targetZip}.MD5 ${DESTINATION}/updates/staging/