From 0b01cc8adcbe35d9ab09916e1974d27da68da3ea Mon Sep 17 00:00:00 2001 From: Sandon Van Ness Date: Tue, 9 Dec 2014 11:58:33 -0800 Subject: [PATCH] Don't assume y on distro kernel reinstall... Because if its the running kernel yum will skip the current version and install install an older package? WTF? I would not expect such behavior from a reinstall but it is what it is... Also skipping current running kernel output was in stderr not the stdout so I made changes to reflect that. Signed-off-by: Sandon Van Ness --- teuthology/task/kernel.py | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/teuthology/task/kernel.py b/teuthology/task/kernel.py index cb2216a007..bebf0a8d7e 100644 --- a/teuthology/task/kernel.py +++ b/teuthology/task/kernel.py @@ -579,12 +579,14 @@ def need_to_install_distro(ctx, role): role_remote.run(args=['sudo', 'yum', 'install', '-y', 'kernel'], stdout=output, stderr=err_mess ) if 'Nothing to do' in output.getvalue(): output.truncate(0), err_mess.truncate(0) - role_remote.run(args=['sudo', 'yum', 'reinstall', '-y', 'kernel', run.Raw('||'), 'true'], stdout=output, stderr=err_mess ) - if 'Skipping the running kernel' in output.getvalue(): - if 'Error: Nothing to do' in output.getvalue(): - # Current running kernel is already newest and updated - log.info('Newest distro kernel already installed/running') - return False + role_remote.run(args=['echo', 'no', run.Raw('|'), 'sudo', 'yum', 'reinstall', 'kernel', run.Raw('||'), 'true'], stdout=output, stderr=err_mess ) + if 'Skipping the running kernel' in err_mess.getvalue(): + # Current running kernel is already newest and updated + log.info('Newest distro kernel already installed/running') + return False + else: + output.truncate(0), err_mess.truncate(0) + role_remote.run(args=['sudo', 'yum', 'reinstall', '-y', 'kernel', run.Raw('||'), 'true'], stdout=output, stderr=err_mess ) #reset stringIO output. output.truncate(0), err_mess.truncate(0) role_remote.run(args=['rpm', '-q', 'kernel', '--last' ], stdout=output, stderr=err_mess ) -- 2.39.5