From: Holger Levsen <holger@layer-acht.org>
Date: Fri, 24 Aug 2012 12:56:43 +0000 (+0200)
Subject: use develop branch
X-Git-Url: https://git.uhu-banane.net/?a=commitdiff_plain;h=61a80143c1c04e294c5e83520095de56ed9f228c;p=profitbricks%2Fjenkins-build-scripts.git

use develop branch
---

diff --git a/liveboot_build.sh b/liveboot_build.sh
index b74ce01..62a82a2 100755
--- a/liveboot_build.sh
+++ b/liveboot_build.sh
@@ -26,12 +26,12 @@ RSYNC_BASE=/srv/mirror/liveboot
 #case $LIVE_TYPE in
 #    default|staging)
 #        RSYNC_SRC="$RSYNC_BASE/"
-#        RSYNC_DST="livebuild@10.1.1.1/livebuild/"       # mgmt1 will transfer this further, see mgmt1:/etc/rsyncd.conf
+#        RSYNC_DST="liveboot@10.1.1.1/livebuild/"       # mgmt1 will transfer this further, see mgmt1:/etc/rsyncd.conf
 #        RSYNC_FILTER='--include=default-** --include=staging-** --exclude=*'
 #        ;;
 #    pbb|pre-staging)
 #        RSYNC_SRC="$BUILD_TARGET/"
-#        RSYNC_DST="livebuild@10.254.1.1/livebuild/"
+#        RSYNC_DST="liveboot@10.254.1.1/livebuild/"
 #        RSYNC_FILTER=''
 #        ;;
 #esac
@@ -50,7 +50,7 @@ cat > $BUILD_SCRIPT <<-EOF
 cd /srv/build
 git clone git://git/ri/liveboot.git
 cd liveboot
-git checkout feature/jenkins
+git checkout develop
 [ -d /srv/build/cache ] && mv /srv/build/cache .
 ./build.sh $BUILD_NUMBER
 EOF