From 70cc92631074ead44746ed62c303dbdc5f583da8 Mon Sep 17 00:00:00 2001
From: Mark Huang <mlhuang@cs.princeton.edu>
Date: Mon, 4 Oct 2004 22:29:19 +0000
Subject: [PATCH] pl_sshd and sidewinder moved to jeeves, finally can get rid
 of pup-cvs

---
 Makefile    |  6 +++---
 build.sh    | 18 +++++-------------
 pup-cvs     | 12 ------------
 pup-cvs.pub |  1 -
 4 files changed, 8 insertions(+), 29 deletions(-)
 delete mode 100644 pup-cvs
 delete mode 100644 pup-cvs.pub

diff --git a/Makefile b/Makefile
index fcd1bf0f..a6b46b84 100644
--- a/Makefile
+++ b/Makefile
@@ -32,7 +32,7 @@
 # NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
-# $Id: Makefile,v 1.45 2004/09/22 04:09:26 mlh-pl_rpm Exp $
+# $Id: Makefile,v 1.46 2004/10/04 22:04:42 mlhuang Exp $
 #
 
 # Default target
@@ -275,7 +275,7 @@ ALL += PlanetLabID
 # Node Manager
 #
 
-sidewinder-CVSROOT := pup-sidewinder@cvs.planet-lab.org:/cvs
+sidewinder-CVSROOT := :pserver:anon@build.planet-lab.org:/cvs
 sidewinder-INITIAL := HEAD
 sidewinder-TAG := HEAD
 sidewinder-MODULE := sidewinder
@@ -286,7 +286,7 @@ ALL += sidewinder
 # pl_sshd
 #
 
-pl_sshd-CVSROOT := pup-pl_sshd@cvs.planet-lab.org:/cvs
+pl_sshd-CVSROOT := :pserver:anon@build.planet-lab.org:/cvs
 pl_sshd-INITIAL := HEAD
 pl_sshd-TAG := HEAD
 pl_sshd-MODULE := pl_sshd
diff --git a/build.sh b/build.sh
index 905bd60c..1e01fcfe 100755
--- a/build.sh
+++ b/build.sh
@@ -4,7 +4,7 @@
 # crontabs to build nightly releases (default). Can also be invoked
 # manually to build a tagged release (-r) in the current directory.
 #
-# $Id: build.sh,v 1.13 2004/09/25 18:09:59 mlhuang Exp $
+# $Id: build.sh,v 1.14 2004/09/25 18:17:00 mlhuang Exp $
 #
 
 # Set defaults
@@ -78,33 +78,25 @@ BASE=${BASE}${i}
 exec 2>&1
 exec &>${BASE}/log
 
-# XXX Hack to store the pup key as well as the bui key
-eval `ssh-agent`
-for i in `grep -l "BEGIN.*PRIVATE KEY" $HOME/.ssh/*` ; do
-    SSH_ASKPASS=/bin/false ssh-add $i
-done
-
 # Build
 cvs -d ${CVSROOT} export -r ${TAG} -d ${BASE} ${MODULE}
 make -C ${BASE}
+rc=$?
 
-if [ $? -ne 0 ] ; then
+if [ $rc -ne 0 ] ; then
     # Notify recipient of failure
     if [ -n "$MAILTO" ] ; then
 	tail -100 ${BASE}/log | mail -s "Failures for ${BASE}" $MAILTO
     fi
 elif [ -n "$BUILDS" ] ; then
     # Remove old nightly runs
-    echo "cd ${ALPHA_ROOT} && ls -t | sed -n ${BUILDS}~1p | xargs rm -rf" | ssh ${ALPHA_BOOT} sh -s
+    echo "cd ${ALPHA_ROOT} && ls -t | sed -n ${BUILDS}~1p | xargs rm -rf" | ssh ${ALPHA_BOOT} /bin/bash -s
     # Update alpha node repository
     for i in RPMS SRPMS ; do
 	ssh ${ALPHA_BOOT} mkdir -p ${ALPHA_ROOT}/${BASE}/${i}
 	find ${BASE}/${i} -type f | xargs -i scp {} ${ALPHA_BOOT}:${ALPHA_ROOT}/${BASE}/${i}
-	ssh ${ALPHA_BOOT} yum-arch ${ALPHA_ROOT}/${BASE}/${i} >/dev/null
+	ssh ${ALPHA_BOOT} yum-arch ${ALPHA_ROOT}/${BASE}/${i}
     done
     # Update symlink
     ssh ${ALPHA_BOOT} ln -nsf ${ALPHA_ROOT}/${BASE}/RPMS/ ${ALPHA_RPMS}
 fi
-
-# Kill the current agent
-ssh-agent -k
diff --git a/pup-cvs b/pup-cvs
deleted file mode 100644
index de6d30fe..00000000
--- a/pup-cvs
+++ /dev/null
@@ -1,12 +0,0 @@
------BEGIN DSA PRIVATE KEY-----
-MIIBvAIBAAKBgQDRgpo/lpwK2t0Y5RJYlitAOXQydmKElSgJV7ZuOEYsboPDg3Co
-Bu88mlJZZ7cGT/3BRfLZ4Fe2U/uEOhWWsezjQ80jwVDUTUVU0Lc5VlGvOUhr97sC
-Bg4SreMYJECdWL5Dr03NPaSrFArmRLUBo9F5BfxKDRe/Kmor1C8bO1stcwIVALTn
-PWsWh9EHV0WU+EJ91nOdkDHrAoGBAK1BFyKL7vWx9N0AKN8vK0deuVSYLzKw2dkb
-aieP1RxQ2tJRSkxdn6QIkzlMvqrFXF+3DePtiaswlCMNaOnlCr7mhcGyo+Eh9kU5
-WJRrPutEzKZ2mjWvbtN8Jpx0OSLRNdL9FKCbCjkYpNPpYpCTfR3sljAKLVNUVNv0
-p4FHzFcRAoGAA2n0Vi0tGb351H/IuaxYoAs205Qzs6sN4+ry1GisH+D5CNGGDaCT
-+heIsb43BMwSQJ8drgSSY7PHD3HPRs/KJrCp5zTeR4n/xoytB0DvV9oFqk1RI7BD
-cZfwS8XZAYHkqnfPlldrqy/iHNGXy8gpHAFPbVms+0JVZPkAarSRuVMCFQCunur0
-bZnMYZM2D3mO/gTvpPCbvg==
------END DSA PRIVATE KEY-----
diff --git a/pup-cvs.pub b/pup-cvs.pub
deleted file mode 100644
index 166261ef..00000000
--- a/pup-cvs.pub
+++ /dev/null
@@ -1 +0,0 @@
-ssh-dss AAAAB3NzaC1kc3MAAACBANGCmj+WnAra3RjlEliWK0A5dDJ2YoSVKAlXtm44Rixug8ODcKgG7zyaUllntwZP/cFF8tngV7ZT+4Q6FZax7ONDzSPBUNRNRVTQtzlWUa85SGv3uwIGDhKt4xgkQJ1YvkOvTc09pKsUCuZEtQGj0XkF/EoNF78qaivULxs7Wy1zAAAAFQC05z1rFofRB1dFlPhCfdZznZAx6wAAAIEArUEXIovu9bH03QAo3y8rR165VJgvMrDZ2RtqJ4/VHFDa0lFKTF2fpAiTOUy+qsVcX7cN4+2JqzCUIw1o6eUKvuaFwbKj4SH2RTlYlGs+60TMpnaaNa9u03wmnHQ5ItE10v0UoJsKORik0+likJN9HeyWMAotU1RU2/SngUfMVxEAAACAA2n0Vi0tGb351H/IuaxYoAs205Qzs6sN4+ry1GisH+D5CNGGDaCT+heIsb43BMwSQJ8drgSSY7PHD3HPRs/KJrCp5zTeR4n/xoytB0DvV9oFqk1RI7BDcZfwS8XZAYHkqnfPlldrqy/iHNGXy8gpHAFPbVms+0JVZPkAarSRuVM= pupdev@cs.princeton.edu
-- 
2.47.0