From: Sage Weil <sage@inktank.com>
Date: Tue, 25 Sep 2012 17:02:08 +0000 (-0700)
Subject: do_release.sh: put user@host in host list files
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=4f9bcc8b2cfc4753f8db864fb9be875a2b59fc7f;p=ceph-build.git

do_release.sh: put user@host in host list files
---

diff --git a/deb_hosts b/deb_hosts
new file mode 100644
index 00000000..4f7b600f
--- /dev/null
+++ b/deb_hosts
@@ -0,0 +1,2 @@
+ubuntu@gitbuilder-precise-amd64.front.sepia.ceph.com
+ubuntu@gitbuilder-precise-i386.front.sepia.ceph.com
diff --git a/debian_hosts b/debian_hosts
deleted file mode 100644
index 47547645..00000000
--- a/debian_hosts
+++ /dev/null
@@ -1,2 +0,0 @@
-localhost
-192.168.106.235
diff --git a/do_release.sh b/do_release.sh
index bab43101..ac3935f5 100755
--- a/do_release.sh
+++ b/do_release.sh
@@ -38,13 +38,13 @@ $bindir/sign_debs.sh $releasedir $vers $gpgkey dsc
 
 for rem in $deb_hosts
 do
-    ssh root@$rem rm -r /tmp/release/\* \; mkdir -p /tmp/release \; rm -r /tmp/ceph-build.\* || true
-    scp -rp $releasedir/$vers root@$rem:/tmp/release/$vers
-    ssh root@$rem git clone git://github.com/ceph/ceph-build /tmp/ceph-build.$$
+    ssh $rem sudo rm -r /tmp/release/\* \; sudo mkdir -p /tmp/release \; sudo rm -r /tmp/ceph-build.\* || true
+    scp -rp $releasedir/$vers $rem:/tmp/release/$vers
+    ssh $rem git clone git://github.com/ceph/ceph-build /tmp/ceph-build.$$
     if [ $xterm -eq 1 ]; then
-	xterm -l -e ssh root@$rem /tmp/ceph-build.$$/build_debs.sh /tmp/release /srv/debian-base $vers &
+	xterm -l -e ssh $rem sudo /tmp/ceph-build.$$/build_debs.sh /tmp/release /srv/debian-base $vers &
     else
-	ssh root@$rem /tmp/ceph-build.$$/build_debs.sh /tmp/release /srv/debian-base $vers > build.$rem 2>&1 &
+	ssh $rem sudo /tmp/ceph-build.$$/build_debs.sh /tmp/release /srv/debian-base $vers > build.$rem 2>&1 &
     fi
     pids="$pids $!"
 done
@@ -52,14 +52,14 @@ done
 # rpms
 for rem in $rpm_hosts
 do
-    ssh root@$rem rm -r /tmp/release/\* \; mkdir -p /tmp/release \; rm -r /tmp/ceph-build.\* || true
-    scp -rp $releasedir/$vers root@$rem:/tmp/release/$vers
-    ssh root@$rem git clone git://github.com/ceph/ceph-build /tmp/ceph-build.$$
+    ssh $rem sudo rm -r /tmp/release/\* \; sudo mkdir -p /tmp/release \; sudo rm -r /tmp/ceph-build.\* || true
+    scp -rp $releasedir/$vers $rem:/tmp/release/$vers
+    ssh $rem git clone git://github.com/ceph/ceph-build /tmp/ceph-build.$$
     exit
     if [ $xterm -eq 1 ]; then
-	xterm -l -e ssh root@$rem /tmp/ceph-build.$$/build_rpms.sh /tmp/release $vers &
+	xterm -l -e ssh $rem sudo /tmp/ceph-build.$$/build_rpms.sh /tmp/release $vers &
     else
-	ssh root@$rem /tmp/ceph-build.$$/build_rpms.sh /tmp/release $vers > build.$rem 2>&1 &
+	ssh $rem sudo /tmp/ceph-build.$$/build_rpms.sh /tmp/release $vers > build.$rem 2>&1 &
     fi
     pids="$pids $!"
 done
@@ -73,11 +73,11 @@ done
 # gather results
 for rem in #$deb_hosts
 do
-   rsync -auv root@$rem:/tmp/release/$vers/\*.\{changes\,deb\} $releasedir/$vers
+   rsync -auv $rem:/tmp/release/$vers/\*.\{changes\,deb\} $releasedir/$vers
 done
 for rem in $rpm_hosts
 do
-    rsync -auv root@$rem:/tmp/release/$vers/rpm/ $releasedir/$vers/rpm
+    rsync -auv $rem:/tmp/release/$vers/rpm/ $releasedir/$vers/rpm
 done
 
 # sign
diff --git a/rpm_hosts b/rpm_hosts
index e9b1e88c..d66400a5 100644
--- a/rpm_hosts
+++ b/rpm_hosts
@@ -1,2 +1,2 @@
-gitbuilder-centos6-amd64.front.sepia.ceph.com
-gitbuilder-fedora17-amd64.front.sepia.ceph.com
+centos@gitbuilder-centos6-amd64.front.sepia.ceph.com
+fedora@gitbuilder-fedora17-amd64.front.sepia.ceph.com