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 6c162e8ca6a5e2fdaf682d2a5710202807c4b19a..76660660f86bbed841a51d83a83ddcd9eb263d77 100755 (executable)
--- 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 4bd24bc0f523b0a820d574dc779d462f8e695fcc..d5b48cd05bf4649472ab78dcca2e0d83a7312fb6 100644 (file)
--- 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(