From: Faiyaz Ahmed <faiyaza@cs.princeton.edu>
Date: Fri, 2 Mar 2007 21:12:49 +0000 (+0000)
Subject: Fix rsync for 2 boot servers.
X-Git-Tag: 4.2-rc2~639
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=aa0c3503a8865789e50d1cacef84a9b6f989e5a4;p=build.git

Fix rsync for 2 boot servers.
---

diff --git a/planetlab.mk b/planetlab.mk
index 2484a114..63fc2aa7 100644
--- a/planetlab.mk
+++ b/planetlab.mk
@@ -4,7 +4,7 @@
 # Mark Huang <mlhuang@cs.princeton.edu>
 # Copyright (C) 2003-2006 The Trustees of Princeton University
 #
-# $Id: planetlab.mk,v 1.49 2007/02/08 15:18:08 mlhuang Exp $
+# $Id: planetlab.mk,v 1.52 2007/03/02 20:55:36 faiyaza Exp $
 #
 
 #
@@ -358,7 +358,8 @@ ALL += myplc-devel
 # 
 
 # Upload packages to boot server
-SERVER := build@boot.planet-lab.org
+SERVERA := build@boot1.planet-lab.org
+SERVERB := build@boot2.planet-lab.org
 ARCHIVE := /plc/data/var/www/html/install-rpms/archive
 
 # Put nightly alpha builds in a subdirectory
@@ -387,7 +388,8 @@ ifneq ($(wildcard /etc/planetlab/secring.gpg),)
 endif
 ifneq ($(BUILDS),)
         # Remove old runs
-	echo "cd $(ARCHIVE) && ls -t | sed -n $(BUILDS)~1p | xargs rm -rf" | ssh $(SERVER) /bin/bash -s
+	echo "cd $(ARCHIVE) && ls -t | sed -n $(BUILDS)~1p | xargs rm -rf" | ssh $(SERVERA) /bin/bash -s
+	echo "cd $(ARCHIVE) && ls -t | sed -n $(BUILDS)~1p | xargs rm -rf" | ssh $(SERVERB) /bin/bash -s
 endif
         # Create package manifest
 	sh ./packages.sh -b "http://build.planet-lab.org/$(subst $(HOME)/,,$(shell pwd))/RPMS" RPMS > packages.xml
@@ -398,12 +400,21 @@ endif
 	rsync \
 	--exclude '*-debuginfo-*' \
 	--recursive --links --perms --times --group --compress --rsh=ssh \
-	RPMS/ $(SERVER):$(ARCHIVE)/$(BASE)
+	RPMS/ $(SERVERA):$(ARCHIVE)/$(BASE)
+	rsync \
+	--exclude '*-debuginfo-*' \
+	--recursive --links --perms --times --group --compress --rsh=ssh \
+	RPMS/ $(SERVERB):$(ARCHIVE)/$(BASE)
 ifeq ($(TAG),HEAD)
         # Update nightly alpha symlink if it does not exist or is broken, or it is Monday
-	if ! ssh $(SERVER) "[ -e $(REPOS) ] && exit 0 || exit 1" || [ "$(shell date +%A)" = "Monday" ] ; then \
-	    ssh $(SERVER) ln -nsf $(ARCHIVE)/$(BASE) $(REPOS) ; \
+	if ! ssh $(SERVERA) "[ -e $(REPOS) ] && exit 0 || exit 1" || [ "$(shell date +%A)" = "Monday" ] ; then \
+	    ssh $(SERVERA) ln -nsf $(ARCHIVE)/$(BASE) $(REPOS) ; \
 	fi
+        # Update nightly alpha symlink if it does not exist or is broken, or it is Monday
+	if ! ssh $(SERVERB) "[ -e $(REPOS) ] && exit 0 || exit 1" || [ "$(shell date +%A)" = "Monday" ] ; then \
+	    ssh $(SERVERB) ln -nsf $(ARCHIVE)/$(BASE) $(REPOS) ; \
+	fi
+
 endif
 endif