]> git.apps.os.sepia.ceph.com Git - teuthology.git/commitdiff
eliminating kernel task duplication 1506/head
authorsunilkumarn417 <sunnagar@redhat.com>
Mon, 8 Jun 2020 14:12:21 +0000 (19:42 +0530)
committersunilkumarn417 <sunnagar@redhat.com>
Mon, 8 Jun 2020 14:12:21 +0000 (19:42 +0530)
Signed-off-by: sunilkumarn417 <sunnagar@redhat.com>
teuthology/run.py

index dbcad1279a694f5e23faa526139c9366dd0c9076..be97b63e0949e8dc8420ea08a55232238e6f4350 100644 (file)
@@ -205,7 +205,8 @@ def get_initial_tasks(lock, config, machine_type):
             {'internal.vm_setup': None},
         ])
 
-    if 'kernel' in config:
+    # install_latest_rh_kernel is used for redhat config
+    if 'redhat' not in config and 'kernel' in config:
         init_tasks.append({'kernel': config['kernel']})
 
     if 'roles' in config:
@@ -220,11 +221,6 @@ def get_initial_tasks(lock, config, machine_type):
         ])
     init_tasks.append({'internal.timer': None})
 
-    # install_latest_rh_kernel is used for redhat config
-    if 'redhat' not in config:
-        if 'kernel' in config:
-            init_tasks.append({'kernel': config['kernel']})
-
     if 'roles' in config:
         init_tasks.extend([
             {'pcp': None},