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

diff --git a/deb_hosts b/deb_hosts
new file mode 100644 (file)
index 0000000..4f7b600
--- /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 (file)
index 4754764..0000000
--- 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 bab431016dec4bbf49e0b11ef43d94b5cf908df2..ac3935f55e4968e62ca2550368ffe3f57035d6e0 100755 (executable)
--- 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 e9b1e88c16edf61277333abd2debabf6a09b47b6..d66400a59d609929a582f8909c4b3cb8d2d782fb 100644 (file)
--- 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