From 46aa5638f6e088776bc45b47516fdbdd992cdb38 Mon Sep 17 00:00:00 2001 From: Zack Cerza Date: Wed, 13 Apr 2016 12:31:04 -0600 Subject: [PATCH] Always use git_ls_remote() for ceph packages Signed-off-by: Zack Cerza --- teuthology/suite.py | 6 +----- teuthology/test/test_suite.py | 6 +----- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/teuthology/suite.py b/teuthology/suite.py index 89b541c94..632f78fcd 100644 --- 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 219552a9e..ded7986ce 100644 --- 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' -- 2.47.3