]> Frank Brehm's Git Trees - profitbricks/jenkins-build-scripts.git/commitdiff
I think this doesnt work, but not sure, so lets try
authorHolger Levsen <holger@layer-acht.org>
Thu, 6 Sep 2012 15:40:07 +0000 (17:40 +0200)
committerHolger Levsen <holger@layer-acht.org>
Thu, 6 Sep 2012 15:40:31 +0000 (17:40 +0200)
debian_build.py
liveboot_build.sh

index b17bb699d9dd55c7e6caa6f0956abd5728952367..5d8cbd03ec1eff9af5ce84f18e95299ec6456a43 100755 (executable)
@@ -471,7 +471,7 @@ if __name__ == '__main__':
 
     # let me see the whole changelog now:
     for line in fileinput.input('debian/changelog'):
-        logger.debug('debian/changelog: %s' %(line.strip()))
+        print('debian/changelog: %s' %(line.strip()))
 
     # set pb_suite which GitBuildPackage() will turn into PB_SUITE
     # if we wrote a changelog entry, use that one
index 805944b57a586205d6a518fcb7abc4f58865d37a..58d4143fc57764c1f17e2e320430d5b5e234a2d0 100755 (executable)
@@ -13,11 +13,8 @@ export PB_SUITE=production-proposed-updates
 #
 # Define default settings
 #
-RSYNC_BASE=/srv/mirror/liveboot
-# BUILD_DATE=${BUILD_DATE:=$(date +%Y%m%d%H%M)}
-# BUILD_ID="${LIVE_TYPE}-${BUILD_DATE}-${BUILD_NUMBER}"           # BUILD_ID is used without lb_build.sh...
-# BUILD_TARGET=$RSYNC_BASE/$BUILD_ID
-
+RSYNC_SRC=/srv/mirror/liveboot
+RSYNC_FILTER=''
 
 #
 # Overwrite settings depending on profile used
@@ -37,12 +34,13 @@ RSYNC_BASE=/srv/mirror/liveboot
 #esac
 
 # WORK IN PROGRESS
-RSYNC_SRC="$RSYNC_BASE/"
-RSYNC_DST="liveboot@riserver/liveboot/" 
-RSYNC_FILTER=''
 
+# ri server
+RSYNC_DST1="liveboot@riserver/liveboot/" 
+# pbb
+RSYNC_DST2="liveboot@10.254.1.1/livebuild/"
 
-figlet "this is work in progress"
+figlet "still work in progress, but... getting there"
 
 BUILD_SCRIPT=$(mktemp)
 
@@ -70,8 +68,10 @@ sudo rm liveboot -Rf
 # Mirror
 #
 echo
-echo "Now rsyncing results to $RSYNC_BASE ..."
-rsync --password-file /etc/rsynclivebuild-send.pass -avv --delete --delete-excluded $RSYNC_FILTER $RSYNC_SRC/ rsync://$RSYNC_DST && figlet "mirror OK"
+echo "Now rsyncing results to $RSYNC_DST1 ..."
+rsync --password-file /etc/rsynclivebuild-send.pass -avv --delete --delete-excluded $RSYNC_FILTER $RSYNC_SRC/ rsync://$RSYNC_DST1 && figlet "mirror OK"
+echo "Now rsyncing results to $RSYNC_DST1 ..."
+rsync --password-file /etc/rsynclivebuild-send.pass -avv --delete --delete-excluded $RSYNC_FILTER $RSYNC_SRC/ rsync://$RSYNC_DST2 && figlet "mirror OK"
 
 #
 # cleanup /srv/mirror, keep MAX number of images