Author: gnichols
Date: 2012-03-02 13:49:00 +0000 (Fri, 02 Mar 2012)
New Revision: 1185
Modified:
trunk/v7/redhatrelease.py
Log:
532557 - test suite should alarm operator and fail test runs on non GA kernel
Modified: trunk/v7/redhatrelease.py
===================================================================
--- trunk/v7/redhatrelease.py 2012-03-02 13:47:46 UTC (rev 1184)
+++ trunk/v7/redhatrelease.py 2012-03-02 13:49:00 UTC (rev 1185)
@@ -87,6 +87,7 @@
self.kernelRPMName = None
self.kernelDevelRPMName = "kernel-devel"
+ self.kernelVersionRelease = None
if "Red Hat" in self.getProduct() and self.getVersion() == 4:
pattern =
re.compile("(?P<versionRelease>[^a-z]*)(?P<name>smp|hugemem|largesmp)?$")
match = pattern.search(unameOutput)
@@ -96,6 +97,7 @@
self.kernelRPMName = "kernel-%s-%s" %
(match.group("name"), match.group("versionRelease"))
else:
self.kernelRPMName = "kernel-%s" %
match.group("versionRelease")
+ self.kernelVersionRelease = match.group("versionRelease")
elif "Red Hat" in self.getProduct() and self.getVersion() >= 5:
pattern =
re.compile("(?P<versionRelease>.*)(?P<product>el[0-9]+)(?P<flavor>xen|PAE|rt)?(?P<arch>.*)$")
@@ -110,12 +112,15 @@
# RT kernel tags rt on the end of el5
if match.group("flavor") == "rt":
self.kernelRPMName = self.kernelRPMName + "rt"
+
+ self.kernelVersionRelease = match.group("versionRelease")
elif 'Fedora' in self.getProduct():
pattern =
re.compile("(?P<versionRelease>.*)(?P<product>fc[0-9]+)(?P<arch>.*)$")
match = pattern.search(unameOutput)
if match:
self.kernelRPMName = "kernel-%s%s%s" %
(match.group("versionRelease"), match.group("product"),
match.group("arch"))
+ self.kernelVersionRelease = match.group("versionRelease")
if not self.kernelRPMName:
print "Error: could not determine kernel RPM name"
@@ -152,6 +157,7 @@
def getKernelRPMName(self): return self.kernelRPMName
def getKernelDevelRPMName(self): return self.kernelDevelRPMName
def getKernel(self): return self.kernel
+ def getKernelVersionRelease(self): return self.kernelVersionRelease
def getArch(self): return self.arch
def getKernelFlavor(self): return self.kernelFlavor
Show replies by date