]> git.apps.os.sepia.ceph.com Git - teuthology.git/commitdiff
task.kernel: Only show latest kernel when running rpm -q kernel 1154/head
authorDavid Galloway <dgallowa@redhat.com>
Thu, 15 Mar 2018 16:12:45 +0000 (12:12 -0400)
committerDavid Galloway <dgallowa@redhat.com>
Thu, 15 Mar 2018 16:46:27 +0000 (12:46 -0400)
Fixes: http://tracker.ceph.com/issues/23381
Signed-off-by: David Galloway <dgallowa@redhat.com>
teuthology/task/kernel.py

index ce5868d9b01ef7b0793f8e4b4b7ab0e5a729f9b7..0f3957a13a90ddb0137b91be21aeee11c51f157e 100644 (file)
@@ -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'):