packaging: Fix GBP._get_distro() for fedora

Gitbuilders use URLs like:
http://gitbuilder.ceph.com/ceph-rpm-fedora20-x86_64-basic/ref/hammer/sha1
Not:
http://gitbuilder.ceph.com/ceph-rpm-fc20-x86_64-basic/ref/hammer/sha1

Signed-off-by: Zack Cerza <zack@redhat.com>

diff --git a/teuthology/packaging.py b/teuthology/packaging.py
index 31354932167a53e4fe64bdaa50fed6f22a59fe62..2ff4ecd972625a6da5e233a823a8cc96471b410b 100644 (file)
--- a/teuthology/packaging.py
+++ b/teuthology/packaging.py
@@ -578,7 +578,7 @@ class GitbuilderProject(object):
         if distro in ('centos', 'rhel'):
             distro = "centos"
         elif distro == "fedora":
-            distro = "fc"
+            distro = "fedora"
         elif distro == "opensuse":
             distro = "opensuse"
         else:

diff --git a/teuthology/test/test_packaging.py b/teuthology/test/test_packaging.py
index b69e47636a626946b28d0d95c15e00b7d5348abf..365edd1d6d2784dfc99110579cf66edc8cec98fa 100644 (file)
--- a/teuthology/test/test_packaging.py
+++ b/teuthology/test/test_packaging.py
@@ -428,7 +428,7 @@ class TestGitbuilderProject(object):
         ('centos', '6.5', None, 'centos6'),
         ('centos', '7.0', None, 'centos7'),
         ('centos', '7.1', None, 'centos7'),
-        ('fedora', '20', None, 'fc20'),
+        ('fedora', '20', None, 'fedora20'),
         ('ubuntu', '14.04', 'trusty', 'trusty'),
         ('ubuntu', '14.04', None, 'trusty'),
         ('debian', '7.0', None, 'wheezy'),
@@ -454,7 +454,7 @@ class TestGitbuilderProject(object):
         GITBUILDER_DISTRO_MATRIX + [
             ('rhel', None, None, 'centos7'),
             ('centos', None, None, 'centos7'),
-            ('fedora', None, None, 'fc20'),
+            ('fedora', None, None, 'fedora20'),
             ('ubuntu', None, None, 'trusty'),
             ('debian', None, None, 'wheezy'),
         ]