Always use git_ls_remote() for ceph packages

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

diff --git a/teuthology/suite.py b/teuthology/suite.py
index 89b541c946ff1f978e178344ca6610d04ad2d789..632f78fcd3250f0bd50753ad437ac1e4025594a8 100644 (file)
--- a/teuthology/suite.py
+++ b/teuthology/suite.py
@@ -253,11 +253,7 @@ def create_initial_config(suite, suite_branch, ceph_branch, teuthology_branch,
         kernel_dict = dict()
 
     # Get the ceph hash
-    if config.suite_verify_ceph_hash:
-        ceph_hash = get_hash('ceph', ceph_branch, kernel_flavor, machine_type,
-                             distro)
-    else:
-        ceph_hash = git_ls_remote('ceph', ceph_branch)
+    ceph_hash = git_ls_remote('ceph', ceph_branch)
 
     if not ceph_hash:
         exc = BranchNotFoundError(ceph_branch, 'ceph.git')

diff --git a/teuthology/test/test_suite.py b/teuthology/test/test_suite.py
index 219552a9ebd7d754ca1b9c50d60e8a28a00c8630..ded7986cea0968c9ac09f26a67321bf02a1d9026 100644 (file)
--- a/teuthology/test/test_suite.py
+++ b/teuthology/test/test_suite.py
@@ -895,19 +895,15 @@ class TestSuiteMain(object):
                 teuthology_schedule=DEFAULT,
                 sleep=DEFAULT,
                 get_arch=lambda x: 'x86_64',
-                git_ls_remote=lambda *args: '1234',
-                get_hash=DEFAULT,
+                git_ls_remote=lambda *args: '12345',
                 package_version_for_hash=lambda *args: 'fake-9.5',
                 ) as m:
             config.suite_verify_ceph_hash = True
-            m['get_hash'].return_value = '12345'
             main(['--suite', suite_name,
                   '--suite-dir', 'teuthology/test',
                   '--throttle', throttle,
                   '--machine-type', machine_type])
             m['sleep'].assert_called_with(int(throttle))
-            m['get_hash'].assert_called_with('ceph', 'master', 'basic',
-                                             machine_type, None)
 
     def test_schedule_suite_noverify(self):
         suite_name = 'noop'