From: Sandon Van Ness <sandon@inktank.com>
Date: Tue, 29 Jul 2014 15:32:09 +0000 (-0700)
Subject: Use auto build script on RPM.
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=1b5576da712a70098712ebb198323000c37a2b6a;p=autobuild-ceph.git

Use auto build script on RPM.

Signed-off-by: Sandon Van Ness <sandon@inktank.com>
---

diff --git a/build-auto.sh b/build-auto.sh
index 6c162e8..7666066 100755
--- a/build-auto.sh
+++ b/build-auto.sh
@@ -24,6 +24,9 @@ fi
 if hostname | grep -q -- ceph-tarball- ; then
     exec $mydir/build-ceph.sh
 fi
+if hostname | grep -q -- ceph-rpm- ; then
+    exec $mydir/build-ceph-rpm.sh
+fi
 
 hostname | sed -e "s|gitbuilder-\([^-]*\)-\([^-]*\)-.*$|\1 \2|" > /tmp/$$
 read -r builder type < /tmp/$$
diff --git a/fabfile.py b/fabfile.py
index 4bd24bc..d5b48cd 100644
--- a/fabfile.py
+++ b/fabfile.py
@@ -732,8 +732,10 @@ def gitbuilder_auto():
 
 @roles('gitbuilder_ceph_rpm')
 def gitbuilder_ceph_rpm():
-    _gitbuilder_ceph_rpm('https://github.com/ceph/ceph.git', 'ceph-rpm')
-    _sync_to_gitbuilder('ceph', 'rpm', 'basic')
+    _gitbuilder_ceph_rpm('https://github.com/ceph/ceph.git', 'auto')
+    hostname = run('hostname -s')
+    flavor = hostname.split('-')[-1]
+    _sync_to_gitbuilder('ceph', 'rpm', flavor)
 
 def _gitbuilder_ceph_rpm(url, flavor):
     _rh_gitbuilder(