Remove unused get_gitbuilder_url()

Its functionality is covered by config.baseurl_template anyway.

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

diff --git a/teuthology/suite.py b/teuthology/suite.py
index 55381e27cfbf573912cd819561efaf164a32cdfc..b96f8f5f62de343392fa0834590cfc6e696db6a2 100644 (file)
--- a/teuthology/suite.py
+++ b/teuthology/suite.py
@@ -519,22 +519,6 @@ def get_distro_defaults(distro, machine_type):
     )
 
 
-def get_gitbuilder_url(project, distro, pkg_type, arch, kernel_flavor):
-    """
-    Return a base URL like:
-        http://gitbuilder.ceph.com/ceph-deb-squeeze-x86_64-basic/
-
-    :param project:       'ceph' or 'kernel'
-    :param distro:        A distro-ish string like 'trusty' or 'fedora20'
-    :param pkg_type:      Probably 'rpm' or 'deb'
-    :param arch:          A string like 'x86_64'
-    :param kernel_flavor: A string like 'basic'
-    """
-    templ = 'http://{host}/{proj}-{pkg}-{distro}-{arch}-{flav}/'
-    return templ.format(proj=project, pkg=pkg_type, distro=distro, arch=arch,
-                        flav=kernel_flavor, host=config.gitbuilder_host)
-
-
 def package_version_for_hash(hash, kernel_flavor='basic',
                              distro='rhel', machine_type='plana'):
     """

diff --git a/teuthology/test/test_suite.py b/teuthology/test/test_suite.py
index 70dfea41fd4c07d83b0b9ecb77d2fb12c7852ab6..08511cfe15f7906e84bc1b0c799fb8e3bfcafae1 100644 (file)
--- a/teuthology/test/test_suite.py
+++ b/teuthology/test/test_suite.py
@@ -50,13 +50,6 @@ class TestSuiteOffline(object):
                                    'mtype', user='USER')
         assert name.startswith('USER-')
 
-    def test_gitbuilder_url(self):
-        ref_url = "http://{host}/ceph-deb-squeeze-x86_64-basic/".format(
-            host=config.gitbuilder_host
-        )
-        assert suite.get_gitbuilder_url('ceph', 'squeeze', 'deb', 'x86_64',
-                                        'basic') == ref_url
-
     def test_substitute_placeholders(self):
         suite_hash = 'suite_hash'
         input_dict = dict(
@@ -97,10 +90,8 @@ class TestSuiteOffline(object):
                                                     input_dict)
         assert 'os_type' not in output_dict
 
-    @patch('teuthology.suite.get_gitbuilder_url')
     @patch('requests.get')
-    def test_get_hash_success(self, m_get, m_get_gitbuilder_url):
-        m_get_gitbuilder_url.return_value = "http://baseurl.com"
+    def test_get_hash_success(self, m_get):
         mock_resp = Mock()
         mock_resp.ok = True
         mock_resp.text = "the_hash"
@@ -108,10 +99,8 @@ class TestSuiteOffline(object):
         result = suite.get_gitbuilder_hash()
         assert result == "the_hash"
 
-    @patch('teuthology.suite.get_gitbuilder_url')
     @patch('requests.get')
-    def test_get_hash_fail(self, m_get, m_get_gitbuilder_url):
-        m_get_gitbuilder_url.return_value = "http://baseurl.com"
+    def test_get_hash_fail(self, m_get):
         mock_resp = Mock()
         mock_resp.ok = False
         m_get.return_value = mock_resp