Author: nickboldt Date: 2011-08-30 13:12:24 -0400 (Tue, 30 Aug 2011) New Revision: 34391 Modified: trunk/build/publish.sh trunk/build/publishComponentZipToStaging.sh trunk/build/publishUpdateZipToStaging.sh Log: add --protocol=28 to fix rsync from old slaves Modified: trunk/build/publish.sh =================================================================== --- trunk/build/publish.sh 2011-08-30 16:24:22 UTC (rev 34390) +++ trunk/build/publish.sh 2011-08-30 17:12:24 UTC (rev 34391) @@ -266,17 +266,17 @@ 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}/ + 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 --delete /tmp/latestBuild.html $DESTINATION/builds/nightly/${PUBLISHPATHSUFFIX}/ + 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}/ + 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 --delete ${STAGINGDIR}/* $DESTINATION/builds/nightly/${JOBNAMEREDUX}/${BUILD_ID}-H${BUILD_NUMBER}/ + date; rsync -arzq --protocol=28 --delete ${STAGINGDIR}/* $DESTINATION/builds/nightly/${JOBNAMEREDUX}/${BUILD_ID}-H${BUILD_NUMBER}/ fi rm -f /tmp/latestBuild.html #else @@ -291,7 +291,7 @@ 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/${JOB_NAME}.next + date; rsync -arzq --protocol=28 --delete ${STAGINGDIR}/* $DESTINATION/builds/staging/${JOB_NAME}.next # 1. To recursively purge contents of .../staging.previous/foobar/ folder: # mkdir -p /tmp/foobar; @@ -315,7 +315,7 @@ # OR, purge contents of /builds/staging.previous/${JOB_NAME} and remove empty dir mkdir -p /tmp/${JOB_NAME} - rsync -arzq --delete /tmp/${JOB_NAME} $DESTINATION/builds/staging.previous/ + rsync -arzq --protocol=28 --delete /tmp/${JOB_NAME} $DESTINATION/builds/staging.previous/ echo -e "rmdir ${JOB_NAME}" | sftp $DESTINATION/builds/staging.previous/ rmdir /tmp/${JOB_NAME} @@ -370,15 +370,15 @@ " echo $metadata >> ${STAGINGDIR}/all/compositeContent.xml echo $metadata >> ${STAGINGDIR}/all/compositeArtifacts.xml - date; rsync -arzq ${STAGINGDIR}/all/composite*.xml $DESTINATION/builds/staging/${JOB_NAME}/all/ + date; rsync -arzq --protocol=28 ${STAGINGDIR}/all/composite*.xml $DESTINATION/builds/staging/${JOB_NAME}/all/ 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 @@ -392,6 +392,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 --delete ${STAGINGDIR}/logs $INTRNALDEST/builds/staging/${JOB_NAME}/ +date; rsync -arzq --protocol=28 --delete ${STAGINGDIR}/logs $DESTINATION/builds/staging/${JOB_NAME}/ +date; rsync -arzq --protocol=28 --delete ${STAGINGDIR}/logs $INTRNALDEST/builds/staging/${JOB_NAME}/ Modified: trunk/build/publishComponentZipToStaging.sh =================================================================== --- trunk/build/publishComponentZipToStaging.sh 2011-08-30 16:24:22 UTC (rev 34390) +++ trunk/build/publishComponentZipToStaging.sh 2011-08-30 17:12:24 UTC (rev 34391) @@ -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: trunk/build/publishUpdateZipToStaging.sh =================================================================== --- trunk/build/publishUpdateZipToStaging.sh 2011-08-30 16:24:22 UTC (rev 34390) +++ trunk/build/publishUpdateZipToStaging.sh 2011-08-30 17:12:24 UTC (rev 34391) @@ -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/