r1337 - trunk
by gnichols＠fedoraproject.org
Author: gnichols
Date: 2012-05-29 17:13:53 +0000 (Tue, 29 May 2012)
New Revision: 1337
Modified:
trunk/v7.spec.in
Log:
changelog
Modified: trunk/v7.spec.in
===================================================================
--- trunk/v7.spec.in 2012-05-29 17:12:50 UTC (rev 1336)
+++ trunk/v7.spec.in 2012-05-29 17:13:53 UTC (rev 1337)
@@ -80,6 +80,16 @@
%changelog
+* Tue May 29 2012 Greg Nichols <gnichols(a)redhat.com>
+
+V7 1.5 R29
+
+ 822690 - v7 fails to generate results package (rpm) if vendor field is not set.
+ 824306 - Fail to open a new cert if 'Make' and/or 'Model' fields empty
+ 817154 - Kernel- Check OS kernel build fails with MRG-RT kernel
+ 823461 - DUP check in info test is wrong
+ 824851 - fv_storage test traceback if --server not set
+
* Mon May 21 2012 Greg Nichols <gnichols(a)redhat.com>
V7 1.5 R28
@@ -87,7 +97,6 @@
817154 - Kernel- Check OS kernel build fails with MRG-RT kernel
732922 - Traceback when cpuscaling is run on XEN
784419 - FEAT: v7 should not error on DUP graylist symbols
- 823461 - DUP check in info test is wrong" info.py
* Thu May 17 2012 Greg Nichols <gnichols(a)redhat.com>
11 years, 11 months
r1336 - trunk/v7
by gnichols＠fedoraproject.org
Author: gnichols
Date: 2012-05-29 17:12:50 +0000 (Tue, 29 May 2012)
New Revision: 1336
Modified:
trunk/v7/fvtest.py
Log:
824851 - fv_storage test traceback if --server not set
Modified: trunk/v7/fvtest.py
===================================================================
--- trunk/v7/fvtest.py 2012-05-29 17:10:16 UTC (rev 1335)
+++ trunk/v7/fvtest.py 2012-05-29 17:12:50 UTC (rev 1336)
@@ -352,7 +352,10 @@
guestScript.write("rpm -ivh /mnt/v7-*.noarch.rpm 2>&1 > /var/log/v7fv.log\n")
# run the tests
guestScript.write("v7 plan --mode auto\n")
- commandToRun = self.v7CommandInGuest + " --mode auto --test " + self.testToRun + ' --server ' + self.getTestServer()
+ commandToRun = self.v7CommandInGuest + " --mode auto --test " + self.testToRun
+ if self.getTestServer():
+ commandToRun += ' --server ' + self.getTestServer()
+
guestScript.write(commandToRun + "\n")
# copy the results to v7data.imghp-dl580g5-01.rhts.bos.redhat.com
guestScript.write("mv /var/v7/results.xml /mnt/.\n")
11 years, 11 months
r1335 - trunk/tests/info
by gnichols＠fedoraproject.org
Author: gnichols
Date: 2012-05-29 17:10:16 +0000 (Tue, 29 May 2012)
New Revision: 1335
Modified:
trunk/tests/info/info.py
Log:
823461 - DUP check in info test is wrong
Modified: trunk/tests/info/info.py
===================================================================
--- trunk/tests/info/info.py 2012-05-29 17:06:50 UTC (rev 1334)
+++ trunk/tests/info/info.py 2012-05-29 17:10:16 UTC (rev 1335)
@@ -322,7 +322,7 @@
try:
Command("rpm -Vf %s" % moduleFile).run()
print "kmod package: %s" % Command("rpm -qf %s" % moduleFile).getString()
- success = abiCheck(module)
+ success = self.abiCheck(module)
except Exception, e:
print "Error: verification failed for kmod %s" % moduleFile
print e
11 years, 11 months
r1334 - trunk/tests/info
by gnichols＠fedoraproject.org
Author: gnichols
Date: 2012-05-29 17:06:50 +0000 (Tue, 29 May 2012)
New Revision: 1334
Modified:
trunk/tests/info/info.py
Log:
817154 - Kernel- Check OS kernel build fails with MRG-RT kernel
Modified: trunk/tests/info/info.py
===================================================================
--- trunk/tests/info/info.py 2012-05-29 17:03:48 UTC (rev 1333)
+++ trunk/tests/info/info.py 2012-05-29 17:06:50 UTC (rev 1334)
@@ -146,7 +146,7 @@
release = self.redHatRelease.getRealTimeRelease()
# else, warn - disable check
else:
- print "Warning: the running kernel is a realtime kernel %s, but product release information could not be found"
+ print "Warning: the running kernel is a realtime kernel, but product release information could not be found"
return True
return self.__checkKernelIsGA(release)
11 years, 11 months
r1333 - trunk/v7
by gnichols＠fedoraproject.org
Author: gnichols
Date: 2012-05-29 17:03:48 +0000 (Tue, 29 May 2012)
New Revision: 1333
Modified:
trunk/v7/hardwaretest.py
Log:
822690 - v7 fails to generate results package (rpm) if vendor field is not set.\n 824306 - Fail to open a new cert if 'Make' and/or 'Model' fields empty
Modified: trunk/v7/hardwaretest.py
===================================================================
--- trunk/v7/hardwaretest.py 2012-05-29 17:02:54 UTC (rev 1332)
+++ trunk/v7/hardwaretest.py 2012-05-29 17:03:48 UTC (rev 1333)
@@ -1014,6 +1014,12 @@
self.removeLogFiles()
return True
+ # make sure model and vendor are set
+ if not (self.certification.getHardware(Tags.vendor) and self.certification.getHardware(Tags.make) and self.certification.getHardware(Tags.model)):
+ print "Error: could not generate results rpm because vendor, make or model are not set"
+ print "Use \"v7 plan --certification to set these values"
+ return False
+
if self.options.mode == Constants.auto or self.ui.promptConfirm("Would you like to package the results?"):
report = Report(self.options, self.certification)
if report.WriteResultsRPM(self.environment.getLogDirectory()):
@@ -1127,10 +1133,24 @@
elif os.path.exists('/proc/device-tree/model'):
f=open('/proc/device-tree/model')
model = f.readline().strip()
+ # if there's a comma, guess the format is <vendor>, <model>
+ try:
+ if ',' in model:
+ vendor = model.split(',')[0]
+ model = model.split(',')[1]
+ except:
+ pass
+
f.close()
- elif arch in ['s390','s390x']:
- vendor = 'IBM'
- make = 'eServer zSeries'
+ # IBM-likely arches
+ if arch in ['s390','s390x', "ppc", "ppc64"]:
+ if not vendor:
+ vendor = 'IBM'
+ if not make:
+ make = 'IBM'
+ if not model:
+ model = arch
+
self.certification.setHardware(Tags.model, model)
11 years, 11 months
r1332 - trunk
by gnichols＠fedoraproject.org
Author: gnichols
Date: 2012-05-29 17:02:54 +0000 (Tue, 29 May 2012)
New Revision: 1332
Modified:
trunk/Makefile
Log:
R29
Modified: trunk/Makefile
===================================================================
--- trunk/Makefile 2012-05-21 14:00:11 UTC (rev 1331)
+++ trunk/Makefile 2012-05-29 17:02:54 UTC (rev 1332)
@@ -14,7 +14,7 @@
# Author: Greg Nichols
V7_VERSION := 1.5
-V7_RELEASE := 28
+V7_RELEASE := 29
V7_VERSION_RELEASE := $(V7_VERSION)-$(V7_RELEASE)
V7_VERSION_PY := v7/version.py
V7_SVN_MODULE := svn+ssh://svn.fedorahosted.org/svn/v7
11 years, 11 months
r1331 - tags
by gnichols＠fedoraproject.org
Author: gnichols
Date: 2012-05-21 14:00:11 +0000 (Mon, 21 May 2012)
New Revision: 1331
Added:
tags/v7-V1-5R28/
Log:
tag version
11 years, 12 months
r1330 - trunk
by gnichols＠fedoraproject.org
Author: gnichols
Date: 2012-05-21 13:59:49 +0000 (Mon, 21 May 2012)
New Revision: 1330
Modified:
trunk/v7.spec.in
Log:
changelog
Modified: trunk/v7.spec.in
===================================================================
--- trunk/v7.spec.in 2012-05-21 13:58:40 UTC (rev 1329)
+++ trunk/v7.spec.in 2012-05-21 13:59:49 UTC (rev 1330)
@@ -82,7 +82,7 @@
%changelog
* Mon May 21 2012 Greg Nichols <gnichols(a)redhat.com>
-V7 1.5 R27
+V7 1.5 R28
817154 - Kernel- Check OS kernel build fails with MRG-RT kernel
732922 - Traceback when cpuscaling is run on XEN
11 years, 12 months
r1329 - trunk/v7
by gnichols＠fedoraproject.org
Author: gnichols
Date: 2012-05-21 13:58:40 +0000 (Mon, 21 May 2012)
New Revision: 1329
Modified:
trunk/v7/kernelInfo.py
Log:
817154 - Kernel- Check OS kernel build fails with MRG-RT kernel
Modified: trunk/v7/kernelInfo.py
===================================================================
--- trunk/v7/kernelInfo.py 2012-05-21 13:57:04 UTC (rev 1328)
+++ trunk/v7/kernelInfo.py 2012-05-21 13:58:40 UTC (rev 1329)
@@ -32,7 +32,7 @@
for productElement in self.getChildElements(Tags.product):
# allow partial match from left
try:
- if productElement.getAttribute(Attributes.name).index(product)is 0:
+ if product.index(productElement.getAttribute(Attributes.name)) is 0:
return productElement
except ValueError:
pass
11 years, 12 months
r1328 - trunk
by gnichols＠fedoraproject.org
Author: gnichols
Date: 2012-05-21 13:57:04 +0000 (Mon, 21 May 2012)
New Revision: 1328
Modified:
trunk/Makefile
Log:
R28
Modified: trunk/Makefile
===================================================================
--- trunk/Makefile 2012-05-21 12:29:25 UTC (rev 1327)
+++ trunk/Makefile 2012-05-21 13:57:04 UTC (rev 1328)
@@ -14,7 +14,7 @@
# Author: Greg Nichols
V7_VERSION := 1.5
-V7_RELEASE := 27
+V7_RELEASE := 28
V7_VERSION_RELEASE := $(V7_VERSION)-$(V7_RELEASE)
V7_VERSION_PY := v7/version.py
V7_SVN_MODULE := svn+ssh://svn.fedorahosted.org/svn/v7
11 years, 12 months