Author: nickboldt Date: 2011-08-01 01:37:19 -0400 (Mon, 01 Aug 2011) New Revision: 33402 Modified: trunk/build/publish.sh Log: instead of staging/FOO, staging.previous/FOO, and staging.previous/FOO.2, omit the FOO.2 folder to save space on disk Modified: trunk/build/publish.sh =================================================================== --- trunk/build/publish.sh 2011-08-01 05:32:30 UTC (rev 33401) +++ trunk/build/publish.sh 2011-08-01 05:37:19 UTC (rev 33402) @@ -300,21 +300,27 @@ # echo -e "rmdir foobar" | sftp tools@filemgmt.jboss.org:/downloads_htdocs/tools/builds/staging.previous/ # rmdir /tmp/foobar - # TODO: JBIDE-8667 move current to previous; move next to current - + # JBIDE-8667 move current to previous; move next to current if [[ ${DESTINATION##*@*:*} == "" ]]; then # user@server, do remote op # create folders if not already there (could be empty) echo -e "mkdir ${JOB_NAME}" | sftp $DESTINATION/builds/staging.previous/ - echo -e "mkdir ${JOB_NAME}.2" | sftp $DESTINATION/builds/staging.previous/ + #echo -e "mkdir ${JOB_NAME}.2" | sftp $DESTINATION/builds/staging.previous/ - # purge contents of /builds/staging.previous/${JOB_NAME}.2 and remove empty dir - mkdir -p /tmp/${JOB_NAME}.2 - rsync -arzq --delete /tmp/${JOB_NAME}.2 $DESTINATION/builds/staging.previous/ - echo -e "rmdir ${JOB_NAME}.2" | sftp $DESTINATION/builds/staging.previous/ - rmdir /tmp/${JOB_NAME}.2 + # IF using .2 folders, purge contents of /builds/staging.previous/${JOB_NAME}.2 and remove empty dir + # NOTE: comment out next section - should only purge one staging.previous/* folder + #mkdir -p /tmp/${JOB_NAME}.2 + #rsync -arzq --delete /tmp/${JOB_NAME}.2 $DESTINATION/builds/staging.previous/ + #echo -e "rmdir ${JOB_NAME}.2" | sftp $DESTINATION/builds/staging.previous/ + #rmdir /tmp/${JOB_NAME}.2 + # 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/ + echo -e "rmdir ${JOB_NAME}" | sftp $DESTINATION/builds/staging.previous/ + rmdir /tmp/${JOB_NAME} + # move contents of /builds/staging.previous/${JOB_NAME} into /builds/staging.previous/${JOB_NAME}.2 - echo -e "rename ${JOB_NAME} ${JOB_NAME}.2" | sftp $DESTINATION/builds/staging.previous/ + #echo -e "rename ${JOB_NAME} ${JOB_NAME}.2" | sftp $DESTINATION/builds/staging.previous/ # move contents of /builds/staging/${JOB_NAME} into /builds/staging.previous/${JOB_NAME} echo -e "rename ${JOB_NAME} ../staging.previous/${JOB_NAME}" | sftp $DESTINATION/builds/staging/ @@ -323,13 +329,18 @@ echo -e "rename ${JOB_NAME}.next ${JOB_NAME}" | sftp $DESTINATION/builds/staging/ else # work locally # create folders if not already there (could be empty) - mkdir -p $DESTINATION/builds/staging.previous/${JOB_NAME} $DESTINATION/builds/staging.previous/${JOB_NAME}.2 + mkdir -p $DESTINATION/builds/staging.previous/${JOB_NAME} + #mkdir -p $DESTINATION/builds/staging.previous/${JOB_NAME}.2 # purge contents of /builds/staging.previous/${JOB_NAME}.2 and remove empty dir - rm -fr $DESTINATION/builds/staging.previous/${JOB_NAME}.2/ + # NOTE: comment out next section - should only purge one staging.previous/* folder + #rm -fr $DESTINATION/builds/staging.previous/${JOB_NAME}.2/ + + # OR, purge contents of /builds/staging.previous/${JOB_NAME} and remove empty dir + rm -fr $DESTINATION/builds/staging.previous/${JOB_NAME}/ # move contents of /builds/staging.previous/${JOB_NAME} into /builds/staging.previous/${JOB_NAME}.2 - mv $DESTINATION/builds/staging.previous/${JOB_NAME} $DESTINATION/builds/staging.previous/${JOB_NAME}.2 + #mv $DESTINATION/builds/staging.previous/${JOB_NAME} $DESTINATION/builds/staging.previous/${JOB_NAME}.2 # move contents of /builds/staging/${JOB_NAME} into /builds/staging.previous/${JOB_NAME} mv $DESTINATION/builds/staging/${JOB_NAME} $DESTINATION/builds/staging.previous/${JOB_NAME} @@ -354,7 +365,7 @@ <children size='3'> <child location='../../../staging/${JOB_NAME}/all/repo/'/> <child location='../../../staging.previous/${JOB_NAME}/all/repo/'/> -<child location='../../../staging.previous/${JOB_NAME}.2/all/repo/'/> +<!-- <child location='../../../staging.previous/${JOB_NAME}.2/all/repo/'/> --> </children> </repository>" echo $metadata >> ${STAGINGDIR}/all/compositeContent.xml