From 66331fb570cf9a41453f8a80cb8a8c36d84a19d6 Mon Sep 17 00:00:00 2001 From: David Galloway Date: Thu, 15 Mar 2018 12:12:45 -0400 Subject: [PATCH] task.kernel: Only show latest kernel when running rpm -q kernel Fixes: http://tracker.ceph.com/issues/23381 Signed-off-by: David Galloway --- teuthology/task/kernel.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/teuthology/task/kernel.py b/teuthology/task/kernel.py index ce5868d9b0..0f3957a13a 100644 --- a/teuthology/task/kernel.py +++ b/teuthology/task/kernel.py @@ -766,7 +766,7 @@ def need_to_install_distro(remote): if current in newest or current.replace('-', '_') in newest: return False log.info( - 'Not newest distro kernel. Curent: {cur} Expected: {new}'.format( + 'Not newest distro kernel. Current: {cur} Expected: {new}'.format( cur=current, new=newest)) return newest @@ -1026,6 +1026,10 @@ def get_latest_image_version_rpm(remote): '-q', 'kernel', '--last', # order by install time + run.Raw('|'), + 'head', # only show top/latest kernel + '-n', + '1', ], stdout=StringIO()) for kernel in proc.stdout.getvalue().split(): if kernel.startswith('kernel'): -- 2.39.5