From: Sage Weil <sage@inktank.com>
Date: Tue, 2 Jun 2015 17:05:22 +0000 (-0700)
Subject: fabfile: use only major version for rpm systems
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=49d579af69f9d994fe4da1045f5b12f2602accb4;p=autobuild-ceph.git

fabfile: use only major version for rpm systems

centos7, not centos7_1_1503 (or whatever).  This was breaking the
rsync-target for gitbuilder-ceph-rpm-centos7-amd64-basic.

Signed-off-by: Sage Weil <sage@inktank.com>
---

diff --git a/fabfile.py b/fabfile.py
index fe31999..d50cee3 100644
--- a/fabfile.py
+++ b/fabfile.py
@@ -793,7 +793,7 @@ def gitbuilder_doc():
 def _sync_to_gitbuilder(package, format, flavor):
     dist_or_codename = '`lsb_release -s -c`'
     if format == 'rpm':
-        dist_or_codename = '`lsb_release -s -i | tr A-Z a-z``lsb_release -s -r | sed -s "s;\.;_;g"`'
+        dist_or_codename = '`lsb_release -s -i | tr A-Z a-z``lsb_release -s -r | sed -s "s;\..*;;g"`'
     with cd('/srv/autobuild-ceph'):
         # fugliness
         sudo("echo gitbuilder@gitbuilder.ceph.com:gitbuilder.ceph.com/{package}-{format}-{dist_or_codename}-`uname -m`-{flavor} > rsync-target".format(