Author: nickboldt Date: 2011-09-15 13:30:02 -0400 (Thu, 15 Sep 2011) New Revision: 34778 Modified: trunk/build/publish.sh Log: add --protocol=28 to rsync -l for bad slaves Modified: trunk/build/publish.sh =================================================================== --- trunk/build/publish.sh 2011-09-15 17:26:16 UTC (rev 34777) +++ trunk/build/publish.sh 2011-09-15 17:30:02 UTC (rev 34778) @@ -41,21 +41,12 @@ z="" if [[ -d ${WORKSPACE}/sources/aggregate/site/target ]]; then siteZip=${WORKSPACE}/sources/aggregate/site/target/site_assembly.zip - if [[ ! -f ${WORKSPACE}/sources/aggregate/site/target/site_assembly.zip ]]; then - siteZip=${WORKSPACE}/sources/aggregate/site/target/site.zip - fi z=$siteZip elif [[ -d ${WORKSPACE}/sources/aggregate/site/site/target ]]; then siteZip=${WORKSPACE}/sources/aggregate/site/site/target/site_assembly.zip - if [[ ! -f ${WORKSPACE}/sources/aggregate/site/site/target/site_assembly.zip ]]; then - siteZip=${WORKSPACE}/sources/aggregate/site/site/target/site.zip - fi z=$siteZip elif [[ -d ${WORKSPACE}/sources/site/target ]]; then siteZip=${WORKSPACE}/sources/site/target/site_assembly.zip - if [[ ! -f ${WORKSPACE}/sources/site/target/site_assembly.zip ]]; then - siteZip=${WORKSPACE}/sources/site/target/site.zip - fi z=$siteZip fi @@ -113,8 +104,8 @@ fi z="" -# if component zips exist, copy them too; first site.zip, then site_assembly.zip -for z in $(find ${WORKSPACE}/sources/*/site/target -type f -name "site*.zip" | sort -r); do +# if component zips exist, copy site_assembly.zip too +for z in $(find ${WORKSPACE}/sources/*/site/target -type f -name "site_assembly.zip"); do y=${z%%/site/target/*}; y=${y##*/} if [[ $y != "aggregate" ]]; then # prevent duplicate nested sites #echo "[$y] $z ..." @@ -275,13 +266,13 @@ 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 + pushd /tmp >/dev/null; ln -s ${BUILD_ID}-H${BUILD_NUMBER} latest; rsync --protocol=28 -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 --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 + pushd /tmp >/dev/null; ln -s ${BUILD_ID}-H${BUILD_NUMBER} latest; rsync --protocol=28 -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