From: Zack Cerza <zack@redhat.com>
Date: Wed, 17 Jun 2015 18:51:44 +0000 (-0600)
Subject: get_latest_image_version_rpm(): ignore non-distro
X-Git-Tag: 1.1.0~912^2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=1bb91394ac68ab1da993e06b7afeaecd25d57195;p=teuthology.git

get_latest_image_version_rpm(): ignore non-distro

This function is only used in distro kernel codepaths. Remove a similar
block of code from need_to_install_distro() and use this function.

Signed-off-by: Zack Cerza <zack@redhat.com>
---

diff --git a/teuthology/task/kernel.py b/teuthology/task/kernel.py
index d523c5b3c3..62634a6c65 100644
--- a/teuthology/task/kernel.py
+++ b/teuthology/task/kernel.py
@@ -656,12 +656,7 @@ def need_to_install_distro(remote):
                                  run.Raw('||'), 'true'])
         # reset stringIO output.
         output.truncate(0)
-        remote.run(args=['rpm', '-q', 'kernel', '--last'], stdout=output)
-        for kernel in output.getvalue().split():
-            if kernel.startswith('kernel'):
-                if 'ceph' not in kernel:
-                    newest = kernel.split('kernel-')[1]
-                    break
+        newest = get_latest_image_version_rpm(remote)
 
     if package_type == 'deb':
         distribution = remote.os.name
@@ -917,6 +912,7 @@ def get_image_version(remote, path):
     log.debug("get_image_version: %s", version)
     return version
 
+
 def get_latest_image_version_rpm(remote):
     """
     Get kernel image version of the newest kernel rpm package.
@@ -927,10 +923,12 @@ def get_latest_image_version_rpm(remote):
             'rpm',
             '-q',
             'kernel',
-            '--last', # order by install time
+            '--last',  # order by install time
         ], stdout=StringIO())
-    out = proc.stdout.getvalue()
-    version = out.split()[0].split('kernel-')[1]
+    for kernel in proc.stdout.getvalue().split():
+        if kernel.startswith('kernel'):
+            if 'ceph' not in kernel:
+                version = kernel.split('kernel-')[1]
     log.debug("get_latest_image_version_rpm: %s", version)
     return version