r1269 - trunk/tests/info
by gnichols＠fedoraproject.org
Author: gnichols
Date: 2012-04-04 01:33:29 +0000 (Wed, 04 Apr 2012)
New Revision: 1269
Modified:
trunk/tests/info/info.py
Log:
809537 - info test kernel validation should allow more flexibility to support beta testing.
Modified: trunk/tests/info/info.py
===================================================================
--- trunk/tests/info/info.py 2012-04-04 01:11:35 UTC (rev 1268)
+++ trunk/tests/info/info.py 2012-04-04 01:33:29 UTC (rev 1269)
@@ -186,9 +186,13 @@
print "Kernel is RHEL %s.%s GA: %s" % (self.redHatRelease.getVersion(), self.redHatRelease.getUpdate(), RHELGAKernel)
return True
# allow partial matches from the left-end of the V-R string
- if self.redHatRelease.getKernelVersionRelease().index(RHELGAKernel) is 0:
- print "Warning: Kernel %s is a partial match RHEL %s.%s GA (%s)." % (self.redHatRelease.getKernelVersionRelease(), self.redHatRelease.getVersion(), self.redHatRelease.getUpdate(), RHELGAKernel)
- return True
+ try:
+ if self.redHatRelease.getKernelVersionRelease().index(RHELGAKernel) is 0:
+ print "Warning: Kernel %s is a partial match RHEL %s.%s GA (%s)." % (self.redHatRelease.getKernelVersionRelease(), self.redHatRelease.getVersion(), self.redHatRelease.getUpdate(), RHELGAKernel)
+ return True
+ except ValueError:
+ # no match, fall through to error
+ pass
# otherwise
print "Error: Kernel is %s and not RHEL %s.%s GA (%s)" % (self.redHatRelease.getKernelVersionRelease(), self.redHatRelease.getVersion(), self.redHatRelease.getUpdate(), RHELGAKernel)
return False
12 years, 1 month
r1268 - trunk
by gnichols＠fedoraproject.org
Author: gnichols
Date: 2012-04-04 01:11:35 +0000 (Wed, 04 Apr 2012)
New Revision: 1268
Modified:
trunk/v7.spec.in
Log:
changelog
Modified: trunk/v7.spec.in
===================================================================
--- trunk/v7.spec.in 2012-04-04 01:11:19 UTC (rev 1267)
+++ trunk/v7.spec.in 2012-04-04 01:11:35 UTC (rev 1268)
@@ -83,7 +83,7 @@
* Tue Apr 02 2012 Greg Nichols <gnichols(a)redhat.com>
-V7 1.5 R15
+V7 1.5 R16
809537 - info test kernel validation should allow more flexibility to support beta testing.
809520 - v7 1.5 R14 traceback on server start
12 years, 1 month
r1267 - trunk
by gnichols＠fedoraproject.org
Author: gnichols
Date: 2012-04-04 01:11:19 +0000 (Wed, 04 Apr 2012)
New Revision: 1267
Modified:
trunk/Makefile
Log:
R16
Modified: trunk/Makefile
===================================================================
--- trunk/Makefile 2012-04-04 01:10:41 UTC (rev 1266)
+++ trunk/Makefile 2012-04-04 01:11:19 UTC (rev 1267)
@@ -14,7 +14,7 @@
# Author: Greg Nichols
V7_VERSION := 1.5
-V7_RELEASE := 15
+V7_RELEASE := 16
V7_VERSION_RELEASE := $(V7_VERSION)-$(V7_RELEASE)
V7_VERSION_PY := v7/version.py
V7_SVN_MODULE := svn+ssh://svn.fedorahosted.org/svn/v7
12 years, 1 month
r1266 - in trunk: tests/info v7
by gnichols＠fedoraproject.org
Author: gnichols
Date: 2012-04-04 01:10:41 +0000 (Wed, 04 Apr 2012)
New Revision: 1266
Modified:
trunk/tests/info/info.py
trunk/v7/kernelInfo.xml
Log:
809537 - info test kernel validation should allow more flexibility to support beta testing.
Modified: trunk/tests/info/info.py
===================================================================
--- trunk/tests/info/info.py 2012-04-04 00:27:22 UTC (rev 1265)
+++ trunk/tests/info/info.py 2012-04-04 01:10:41 UTC (rev 1266)
@@ -180,13 +180,18 @@
print "reading kernel info file " + kernelInfoFile
kernelInfo = KernelInfo(kernelInfoFile)
RHELGAKernel = kernelInfo.getGAKernel(self.redHatRelease.getVersion(), self.redHatRelease.getUpdate())
- # allow partial matches from the left-end of the V-R string
- if self.redHatRelease.getKernelVersionRelease().index(RHELGAKernel) is 0:
- print "Kernel is RHEL %s.%s GA: %s" % (self.redHatRelease.getVersion(), self.redHatRelease.getUpdate(), RHELGAKernel)
- return True
- else:
- print "Error: Kernel is %s and not RHEL %s.%s GA (%s)" % (self.redHatRelease.getKernelVersionRelease(), self.redHatRelease.getVersion(), self.redHatRelease.getUpdate(), RHELGAKernel)
- return False
+
+ if RHELGAKernel:
+ if self.redHatRelease.getKernelVersionRelease() == RHELGAKernel:
+ print "Kernel is RHEL %s.%s GA: %s" % (self.redHatRelease.getVersion(), self.redHatRelease.getUpdate(), RHELGAKernel)
+ return True
+ # allow partial matches from the left-end of the V-R string
+ if self.redHatRelease.getKernelVersionRelease().index(RHELGAKernel) is 0:
+ print "Warning: Kernel %s is a partial match RHEL %s.%s GA (%s)." % (self.redHatRelease.getKernelVersionRelease(), self.redHatRelease.getVersion(), self.redHatRelease.getUpdate(), RHELGAKernel)
+ return True
+ # otherwise
+ print "Error: Kernel is %s and not RHEL %s.%s GA (%s)" % (self.redHatRelease.getKernelVersionRelease(), self.redHatRelease.getVersion(), self.redHatRelease.getUpdate(), RHELGAKernel)
+ return False
except IOError:
print "Error: could not open kernel info file " + kernelInfoFile
return False
Modified: trunk/v7/kernelInfo.xml
===================================================================
--- trunk/v7/kernelInfo.xml 2012-04-04 00:27:22 UTC (rev 1265)
+++ trunk/v7/kernelInfo.xml 2012-04-04 01:10:41 UTC (rev 1266)
@@ -10,11 +10,12 @@
<update number='5' kernel='2.6.18-194'/>
<update number='6' kernel='2.6.18-238'/>
<update number='7' kernel='2.6.18-274'/>
+ <update number='8' kernel='2.6.18-'/>
</release>
<release number='6'>
<update number='0' kernel='2.6.32-71'/>
<update number='1' kernel='2.6.32-131.0.15'/>
<update number='2' kernel='2.6.32-220'/>
- <update number='3' kernel='2.6.32-'/>
+ <update number='3' kernel='2.6.32-'/>
</release>
</v7-kernel-info>
12 years, 1 month
r1265 - tags
by gnichols＠fedoraproject.org
Author: gnichols
Date: 2012-04-04 00:27:22 +0000 (Wed, 04 Apr 2012)
New Revision: 1265
Added:
tags/v7-V1-5R15/
Log:
tag version
12 years, 1 month
r1264 - trunk
by gnichols＠fedoraproject.org
Author: gnichols
Date: 2012-04-04 00:26:55 +0000 (Wed, 04 Apr 2012)
New Revision: 1264
Modified:
trunk/Makefile
Log:
R15
Modified: trunk/Makefile
===================================================================
--- trunk/Makefile 2012-04-04 00:25:54 UTC (rev 1263)
+++ trunk/Makefile 2012-04-04 00:26:55 UTC (rev 1264)
@@ -14,7 +14,7 @@
# Author: Greg Nichols
V7_VERSION := 1.5
-V7_RELEASE := 14
+V7_RELEASE := 15
V7_VERSION_RELEASE := $(V7_VERSION)-$(V7_RELEASE)
V7_VERSION_PY := v7/version.py
V7_SVN_MODULE := svn+ssh://svn.fedorahosted.org/svn/v7
12 years, 1 month
r1263 - trunk
by gnichols＠fedoraproject.org
Author: gnichols
Date: 2012-04-04 00:25:54 +0000 (Wed, 04 Apr 2012)
New Revision: 1263
Modified:
trunk/v7.spec.in
Log:
changelog
Modified: trunk/v7.spec.in
===================================================================
--- trunk/v7.spec.in 2012-04-04 00:22:27 UTC (rev 1262)
+++ trunk/v7.spec.in 2012-04-04 00:25:54 UTC (rev 1263)
@@ -81,6 +81,13 @@
%changelog
+* Tue Apr 02 2012 Greg Nichols <gnichols(a)redhat.com>
+
+V7 1.5 R15
+
+ 809537 - info test kernel validation should allow more flexibility to support beta testing.
+ 809520 - v7 1.5 R14 traceback on server start
+
* Mon Apr 02 2012 Greg Nichols <gnichols(a)redhat.com>
V7 1.5 R14
12 years, 1 month
r1262 - in trunk: tests/info v7
by gnichols＠fedoraproject.org
Author: gnichols
Date: 2012-04-04 00:22:27 +0000 (Wed, 04 Apr 2012)
New Revision: 1262
Modified:
trunk/tests/info/info.py
trunk/v7/kernelInfo.xml
Log:
809537 - info test kernel validation should allow more flexibility to support beta testing.
Modified: trunk/tests/info/info.py
===================================================================
--- trunk/tests/info/info.py 2012-04-03 14:59:41 UTC (rev 1261)
+++ trunk/tests/info/info.py 2012-04-04 00:22:27 UTC (rev 1262)
@@ -46,7 +46,7 @@
if "Red Hat" in self.redHatRelease.getProduct() and self.redHatRelease.getVersion() < 6:
# kernel-devel or varient is required for the ABI whitelist for RHEL5
rpms = [self.redHatRelease.getKernelDevelRPMName()]
- else:
+ else: # RHEL6 and beyond
rpms = ["kabi-whitelists"]
rpms.append("policycoreutils")
return rpms
@@ -180,7 +180,8 @@
print "reading kernel info file " + kernelInfoFile
kernelInfo = KernelInfo(kernelInfoFile)
RHELGAKernel = kernelInfo.getGAKernel(self.redHatRelease.getVersion(), self.redHatRelease.getUpdate())
- if RHELGAKernel == self.redHatRelease.getKernelVersionRelease():
+ # allow partial matches from the left-end of the V-R string
+ if self.redHatRelease.getKernelVersionRelease().index(RHELGAKernel) is 0:
print "Kernel is RHEL %s.%s GA: %s" % (self.redHatRelease.getVersion(), self.redHatRelease.getUpdate(), RHELGAKernel)
return True
else:
Modified: trunk/v7/kernelInfo.xml
===================================================================
--- trunk/v7/kernelInfo.xml 2012-04-03 14:59:41 UTC (rev 1261)
+++ trunk/v7/kernelInfo.xml 2012-04-04 00:22:27 UTC (rev 1262)
@@ -15,5 +15,6 @@
<update number='0' kernel='2.6.32-71'/>
<update number='1' kernel='2.6.32-131.0.15'/>
<update number='2' kernel='2.6.32-220'/>
+ <update number='3' kernel='2.6.32-'/>
</release>
-</v7-kernel-info>
\ No newline at end of file
+</v7-kernel-info>
12 years, 1 month
r1261 - trunk/v7
by gnichols＠fedoraproject.org
Author: gnichols
Date: 2012-04-03 14:59:41 +0000 (Tue, 03 Apr 2012)
New Revision: 1261
Modified:
trunk/v7/hardwaretest.py
Log:
807714 - v7 1.5 R12 requires udisks package not in RHEL5
Modified: trunk/v7/hardwaretest.py
===================================================================
--- trunk/v7/hardwaretest.py 2012-04-03 00:38:18 UTC (rev 1260)
+++ trunk/v7/hardwaretest.py 2012-04-03 14:59:41 UTC (rev 1261)
@@ -498,7 +498,7 @@
subcommand = args[1]
else:
subcommand = "start"
- planner = Planner(self.options, virtualization=None)
+ planner = Planner(self.options, virtualization=None, redHatRelease=self.redHatRelease)
planner.analyse(self.environment.getSourceDirectory())
daemon = V7Daemon(self.environment, planner, self.options)
12 years, 1 month
r1260 - tags
by gnichols＠fedoraproject.org
Author: gnichols
Date: 2012-04-03 00:38:18 +0000 (Tue, 03 Apr 2012)
New Revision: 1260
Added:
tags/v7-V1-5R14/
Log:
tag version
12 years, 1 month