From 977e6f4f5e4a8cb3c91a7ee40e9d0d7bd61fd310 Mon Sep 17 00:00:00 2001 From: Zack Cerza Date: Fri, 20 May 2016 17:03:20 -0600 Subject: [PATCH] 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 --- teuthology/packaging.py | 2 +- teuthology/test/test_packaging.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/teuthology/packaging.py b/teuthology/packaging.py index 3135493216..2ff4ecd972 100644 --- 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 b69e47636a..365edd1d6d 100644 --- 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'), ] -- 2.39.5