From: Kefu Chai <kchai@redhat.com>
Date: Tue, 23 Jun 2020 09:02:43 +0000 (+0800)
Subject: teuthology/run: do not check ceph packages if verify_ceph_hash is disabled
X-Git-Tag: 1.1.0~82^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F1520%2Fhead;p=teuthology.git

teuthology/run: do not check ceph packages if verify_ceph_hash is disabled

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

diff --git a/teuthology/run.py b/teuthology/run.py
index 5ecd2f6e1..f58bcecd5 100644
--- a/teuthology/run.py
+++ b/teuthology/run.py
@@ -170,7 +170,13 @@ def get_initial_tasks(lock, config, machine_type):
     overrides = config.get('overrides', {})
     having_repos = ('repo' in config.get('install', {}) or
                     'repo' in overrides.get('install', {}))
-    if not ('redhat' in config or having_repos):
+    if 'redhat' in config:
+        pass
+    elif having_repos:
+        pass
+    elif not config.get('verify_ceph_hash', True):
+        pass
+    else:
         init_tasks += [
             {'internal.check_packages': None},
             {'internal.buildpackages_prep': None},