suite/run.py: check config['verify_ceph_hash'] before verifying ceph packages

there is chance that we don't have ceph packages built for the
combination of specified os_type and os_version, for instance, in the
case of rados/thash_old_clients, older ceph clients are installed on
el7, but the ceph cluster is deployed using cephadm, which in turn pull
ceph container images built using the ceph being tested and el8.

since we've dropped the build of master on el7, there is no need to
verify if ceph package is available if cephadm is used for deploying the
cluster.

Signed-off-by: Kefu Chai <kchai@redhat.com>

diff --git a/teuthology/suite/run.py b/teuthology/suite/run.py
index 67b6056461dbeb9fdaeeca5d966e5afe8aea268d..e63fb562bb21e6d02d423c8f0020b49d2f0113d7 100644 (file)
--- a/teuthology/suite/run.py
+++ b/teuthology/suite/run.py
@@ -429,7 +429,8 @@ class Run(object):
             )
 
             sha1 = self.base_config.sha1
-            if config.suite_verify_ceph_hash:
+            if parsed_yaml.get('verify_ceph_hash',
+                               config.suite_verify_ceph_hash):
                 full_job_config = copy.deepcopy(self.base_config.to_dict())
                 deep_merge(full_job_config, parsed_yaml)
                 flavor = util.get_install_task_flavor(full_job_config)