From: sunilkumarn417 <sunnagar@redhat.com>
Date: Mon, 8 Jun 2020 14:12:21 +0000 (+0530)
Subject: eliminating kernel task duplication
X-Git-Tag: 1.1.0~90^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F1506%2Fhead;p=teuthology.git

eliminating kernel task duplication

Signed-off-by: sunilkumarn417 <sunnagar@redhat.com>
---

diff --git a/teuthology/run.py b/teuthology/run.py
index dbcad1279..be97b63e0 100644
--- a/teuthology/run.py
+++ b/teuthology/run.py
@@ -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},