From 3eab1a13f0aa2fa1526941d0a2a461d262c082af Mon Sep 17 00:00:00 2001 From: Holger Levsen Date: Fri, 7 Sep 2012 12:19:42 +0200 Subject: [PATCH] general code cleanup and remove cache handling --- liveboot_build.sh | 20 ++++++-------------- 1 file changed, 6 insertions(+), 14 deletions(-) diff --git a/liveboot_build.sh b/liveboot_build.sh index 8bd601a..60983dc 100755 --- a/liveboot_build.sh +++ b/liveboot_build.sh @@ -3,23 +3,18 @@ # copyright 2012 Holger Levsen # GPL2 licenced - set -e - export -export DIST=squeeze -export PB_SUITE=production-proposed-updates - # # Define default settings # +export DIST=squeeze +export PB_SUITE=production-proposed-updates RSYNC_SRC=/srv/mirror/liveboot RSYNC_FILTER='' - # WORK IN PROGRESS - # ri server RSYNC_DST1="liveboot@riserver/liveboot/" # pbb (mgmt5) @@ -30,7 +25,6 @@ RSYNC_DST3="liveboot@10.252.1.1/liveboot/" figlet "still work in progress, but... getting there" BUILD_SCRIPT=$(mktemp) - cat > $BUILD_SCRIPT <<-EOF cd /srv/build git clone git://git/ri/liveboot.git @@ -39,16 +33,13 @@ git checkout $GIT_BRANCH [ -d /srv/build/cache ] && mv /srv/build/cache . ./build.sh $BUILD_NUMBER $GIT_BRANCH EOF - sudo pbuilder --execute --bindmounts /srv/build/ -- $BUILD_SCRIPT # FIXME: too much sudo here... cd /srv/build/liveboot/builds sudo mv *-* /srv/mirror/liveboot -cd /srv/build/liveboot -sudo mv cache .. -cd .. +cd /srv/build/ sudo rm liveboot -Rf # @@ -71,7 +62,7 @@ echo "mirror to DCs is MISSING" # cleanup /srv/mirror, keep MAX number of images # #MAX=15 -#cd $RSYNC_BASE +#cd $RSYNC_SRC #COUNT=0 #for i in $(ls -atd1 ./${LIVE_TYPE}-*) ; do # let COUNT=COUNT+1 @@ -83,4 +74,5 @@ echo "mirror to DCs is MISSING" #done #figlet "cleanup OK" -echo "cleanup DISABLED" +echo -n "cleanup DISABLED: " +du -sh /srv/mirror/liveboot -- 2.39.5