From 5fc46b2ecaf603bbb6fa81e4a8bb71e7e640b871 Mon Sep 17 00:00:00 2001 From: sunilkumarn417 Date: Mon, 8 Jun 2020 19:42:21 +0530 Subject: [PATCH] eliminating kernel task duplication Signed-off-by: sunilkumarn417 --- teuthology/run.py | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/teuthology/run.py b/teuthology/run.py index dbcad1279a..be97b63e09 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}, -- 2.39.5