r1019 - trunk/v7
by gnichols＠fedoraproject.org
Author: gnichols
Date: 2011-07-19 10:47:11 +0000 (Tue, 19 Jul 2011)
New Revision: 1019
Modified:
trunk/v7/hardwaretest.py
Log:
711155 - v7: sh: kudzu: command not found
Modified: trunk/v7/hardwaretest.py
===================================================================
--- trunk/v7/hardwaretest.py 2011-07-19 10:46:12 UTC (rev 1018)
+++ trunk/v7/hardwaretest.py 2011-07-19 10:47:11 UTC (rev 1019)
@@ -239,14 +239,14 @@
self.certification.getHardware(Tags.make),
self.certification.getHardware(Tags.model))
- self.certification.setOS(Tags.name, self.redhatRelease.getCodeName())
- if self.redhatRelease.getVersionPointUpdate():
- self.certification.setOS(Tags.release, self.redhatRelease.getVersionPointUpdate())
+ self.certification.setOS(Tags.name, self.redHatRelease.getCodeName())
+ if self.redHatRelease.getVersionPointUpdate():
+ self.certification.setOS(Tags.release, self.redHatRelease.getVersionPointUpdate())
else:
print "Error: could not determine OS release number"
return False
- if self.redhatRelease.getProduct():
- self.certification.setOS(Tags.product, self.redhatRelease.getProduct())
+ if self.redHatRelease.getProduct():
+ self.certification.setOS(Tags.product, self.redHatRelease.getProduct())
else:
print "Error: could not determine OS product name"
return False
@@ -992,6 +992,8 @@
vendor = val
if key == "Product Name":
model = val
+ # try and use the first word as the make
+ make = val.split()[0]
if vendor and model:
break
dmidecode.close()
12 years, 10 months
r1018 - trunk
by gnichols＠fedoraproject.org
Author: gnichols
Date: 2011-07-19 10:46:12 +0000 (Tue, 19 Jul 2011)
New Revision: 1018
Modified:
trunk/Makefile
Log:
R14
Modified: trunk/Makefile
===================================================================
--- trunk/Makefile 2011-07-15 16:37:30 UTC (rev 1017)
+++ trunk/Makefile 2011-07-19 10:46:12 UTC (rev 1018)
@@ -14,7 +14,7 @@
# Author: Greg Nichols
V7_VERSION := 1.4
-V7_RELEASE := 13
+V7_RELEASE := 14
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, 10 months
r1017 - tags
by gnichols＠fedoraproject.org
Author: gnichols
Date: 2011-07-15 16:37:30 +0000 (Fri, 15 Jul 2011)
New Revision: 1017
Added:
tags/v7-V1-4R13/
Log:
tag version
12 years, 10 months
r1016 - trunk
by gnichols＠fedoraproject.org
Author: gnichols
Date: 2011-07-15 16:36:59 +0000 (Fri, 15 Jul 2011)
New Revision: 1016
Modified:
trunk/v7.spec.in
Log:
changelog
Modified: trunk/v7.spec.in
===================================================================
--- trunk/v7.spec.in 2011-07-15 16:35:12 UTC (rev 1015)
+++ trunk/v7.spec.in 2011-07-15 16:36:59 UTC (rev 1016)
@@ -77,11 +77,12 @@
%changelog
-* Wed Jul 13 2011 Greg Nichols <gnichols(a)redhat.com>
+* Fri Jul 15 2011 Greg Nichols <gnichols(a)redhat.com>
-V7 1.4 R12
+V7 1.4 R13
521609 - v7 plan --server says server has error: /var/v7/export
+ 711155 - v7: sh: kudzu: command not found
* Tue Jul 12 2011 Greg Nichols <gnichols(a)redhat.com>
12 years, 10 months
r1015 - trunk/v7
by gnichols＠fedoraproject.org
Author: gnichols
Date: 2011-07-15 16:35:12 +0000 (Fri, 15 Jul 2011)
New Revision: 1015
Modified:
trunk/v7/hardwaretest.py
Log:
711155 - v7: sh: kudzu: command not found
Modified: trunk/v7/hardwaretest.py
===================================================================
--- trunk/v7/hardwaretest.py 2011-07-15 16:33:31 UTC (rev 1014)
+++ trunk/v7/hardwaretest.py 2011-07-15 16:35:12 UTC (rev 1015)
@@ -62,6 +62,7 @@
self.runMode = self.options.mode
self.command = None
self.virtualization = None
+ self.redHatRelease = RedHatRelease()
self.commands = {'plan': self.doPlan,
'verify': self.doVerify,
@@ -237,15 +238,15 @@
print "Hardware: %s %s %s" % (self.certification.getHardware(Tags.vendor),
self.certification.getHardware(Tags.make),
self.certification.getHardware(Tags.model))
- redHatRelease = RedHatRelease()
- self.certification.setOS(Tags.name, redHatRelease.getCodeName())
- if redHatRelease.getVersionPointUpdate():
- self.certification.setOS(Tags.release, redHatRelease.getVersionPointUpdate())
+
+ self.certification.setOS(Tags.name, self.redhatRelease.getCodeName())
+ if self.redhatRelease.getVersionPointUpdate():
+ self.certification.setOS(Tags.release, self.redhatRelease.getVersionPointUpdate())
else:
print "Error: could not determine OS release number"
return False
- if redHatRelease.getProduct():
- self.certification.setOS(Tags.product, redHatRelease.getProduct())
+ if self.redhatRelease.getProduct():
+ self.certification.setOS(Tags.product, self.redhatRelease.getProduct())
else:
print "Error: could not determine OS product name"
return False
@@ -771,14 +772,15 @@
syslog.syslog("Test error: %s" % e)
success = False
- # use Kudzu for old rhr's hardware.out
- if self.debugLevel != Constants.off:
- print "Getting devices from kudzu"
- kudzu = Kudzu()
- if not kudzu.isValid():
- success = False
- else:
- run.appendDevices(deviceClass.getDevicesFromDetector(kudzu))
+ # use Kudzu for old rhr's hardware.out
+ if self.redHatRelease.getVersion() < 6:
+ if self.debugLevel != Constants.off:
+ print "Getting devices from kudzu"
+ kudzu = Kudzu()
+ if not kudzu.isValid():
+ success = False
+ else:
+ run.appendDevices(deviceClass.getDevicesFromDetector(kudzu))
return success
12 years, 10 months
r1014 - trunk/tests/kdump
by gnichols＠fedoraproject.org
Author: gnichols
Date: 2011-07-15 16:33:31 +0000 (Fri, 15 Jul 2011)
New Revision: 1014
Modified:
trunk/tests/kdump/kdump.py
Log:
521609 - v7 plan --server says server has error: /var/v7/export
Modified: trunk/tests/kdump/kdump.py
===================================================================
--- trunk/tests/kdump/kdump.py 2011-07-15 16:32:48 UTC (rev 1013)
+++ trunk/tests/kdump/kdump.py 2011-07-15 16:33:31 UTC (rev 1014)
@@ -74,9 +74,9 @@
def startServer(self):
os.system("service nfs start")
- dataDirectory = self.environment.getDataDirectory()
- exportDirectory = dataDirectory + '/export'
- for directory in (dataDirectory, exportDirectory):
+ serverDirectory = self.environment.getServerDirectory()
+ exportDirectory = os.path.join(serverDirectory, self.environment.getServerExport())
+ for directory in (serverDirectory, exportDirectory):
try:
os.mkdir(directory)
print "Created %s" % directory
@@ -97,7 +97,7 @@
# changed from using "exportfs" since this is called via httpd/cgi, and exportfs uses a
# lock file not readable by non-root users.F
exportfs = Command("cat /var/lib/nfs/etab")
- exportfs.getString(regex=".*%s/export" % self.environment.getDataDirectory(), singleLine=False)
+ exportfs.getString(regex=".*%s/%s" % (self.environment.getServerDirectory(), self.environment.getServerExport()), singleLine=False)
print "%s/export is exported" % self.environment.getDataDirectory()
except V7CommandException, exception:
print "Error: %s/export is not available" % self.environment.getDataDirectory()
@@ -125,6 +125,9 @@
print "Checking kdump configuration"
# check crashkernel on kernel command line
+ # typical settings:
+ # ppc64: 512M@64M
+ # x86_64: 128M
kernelBootParams = Command("cat /proc/cmdline")
kdump = None
try:
@@ -180,8 +183,8 @@
elif self.getLogicalDeviceName() == Constants.nfs:
if self.getTestServer() and self.getTestServer() != "unknown":
# Note: the assumption is that the environment for the SUT is the same as the environment
- # for the server being used - both have the same data directory setting.
- net = "%s:%s/export" % (self.getTestServer(), self.environment.getDataDirectory())
+ # for the server being used - both have the same server directory setting.
+ net = "%s:%s/export" % (self.getTestServer(), self.environment.getServerDirectory(), self.environment.getServerExport())
print "Adding net %s to %s" % (net, self.kdumpConfigPath)
configFile.addParameter("net", net)
restart = True
12 years, 10 months
r1013 - trunk/v7
by gnichols＠fedoraproject.org
Author: gnichols
Date: 2011-07-15 16:32:48 +0000 (Fri, 15 Jul 2011)
New Revision: 1013
Modified:
trunk/v7/environment.py
Log:
521609 - v7 plan --server says server has error: /var/v7/export
Modified: trunk/v7/environment.py
===================================================================
--- trunk/v7/environment.py 2011-07-15 16:25:38 UTC (rev 1012)
+++ trunk/v7/environment.py 2011-07-15 16:32:48 UTC (rev 1013)
@@ -28,6 +28,8 @@
DocumentBase.__init__(self)
self.environmentFile = "/etc/v7.xml"
self.defaultDataDirectory = "/var/v7"
+ self.defaultServerDirectory = "/var/www/v7"
+ self.defaultExport = "export"
self.defaultDatabaseName = "results.xml"
self.defaultTaskFile = "tasks"
self.defaultLockFile = "/var/lock/subsys/v7"
@@ -57,15 +59,24 @@
# set up defaults
filesystemElement = self.findOrCreateElement(self.document.documentElement, Tags.file_system)
- filesystemElement.setAttribute(Attributes.maximum_attachment_size, "%u" % self.defaultMaximumAttachmentFileSize)
+ filesystemElement.setAttribute(Attributes.maximum_attachment_size, "%u" % self.defaultMaximumAttachmentFileSize)
filesystemElement.setAttribute(Attributes.results_warning_size, "%u" % self.defaultResultsWarningSize)
urlElement = self.findOrCreateElement(self.document.documentElement, Tags.urls)
+
+ # data-directory
element = self.findOrCreateElement(filesystemElement, Tags.data_directory)
self.setTextNode(element, self.defaultDataDirectory)
element.setAttribute(Attributes.database_name, self.defaultDatabaseName)
element.setAttribute(Attributes.task_file, self.defaultTaskFile)
element.setAttribute(Attributes.lock_file, self.defaultLockFile)
+
+ # server-directory
+ element = self.findOrCreateElement(filesystemElement, Tags.server_directory)
+ self.setTextNode(element, self.defaultServerDirectory)
+ element.setAttribute(Attributes.export, self.defaultExport)
+
+
element = self.findOrCreateElement(filesystemElement, Tags.store_directory)
self.setTextNode(element, self.defaultStoreDirectory)
element = self.findOrCreateElement(filesystemElement, Tags.source_directory)
@@ -106,6 +117,19 @@
dataDirectoryElement = self.findOrCreateElement(self._getFilesystemElement(), Tags.data_directory)
return self.getTextNode(dataDirectoryElement).data
+ def getServerDirectory(self):
+ serverDirectoryElement = self.findOrCreateElement(self._getFilesystemElement(), Tags.server_directory)
+ if not self.getTextNode(serverDirectoryElement):
+ self.setTextNode(serverDirectoryElement, self.defaultServerDirectory)
+ serverDirectoryElement.setAttribute(Attributes.export, self.defaultExport)
+ self.save(self.environmentFile)
+ return self.getTextNode(serverDirectoryElement).data
+
+ def getServerExport(self):
+ self.getServerDirectory() # so it gets created if not found
+ serverDirectoryElement = self.findOrCreateElement(self._getFilesystemElement(), Tags.server_directory)
+ return serverDirectoryElement.getAttribute(Attributes.export)
+
def getStoreDirectory(self):
storeDirectoryElement = self.findOrCreateElement(self._getFilesystemElement(), Tags.store_directory)
return self.getTextNode(storeDirectoryElement).data
12 years, 10 months
r1012 - trunk/v7
by gnichols＠fedoraproject.org
Author: gnichols
Date: 2011-07-15 16:25:38 +0000 (Fri, 15 Jul 2011)
New Revision: 1012
Modified:
trunk/v7/tags.py
Log:
521609 - v7 plan --server says server has error: /var/v7/export
Modified: trunk/v7/tags.py
===================================================================
--- trunk/v7/tags.py 2011-07-15 16:24:03 UTC (rev 1011)
+++ trunk/v7/tags.py 2011-07-15 16:25:38 UTC (rev 1012)
@@ -43,6 +43,7 @@
v7_environment="v7-environment"
file_system="file-system"
data_directory="data-directory"
+ server_directory="server-directory"
source_directory="source-directory"
store_directory="store-directory"
library_directory="library-directory"
@@ -105,6 +106,7 @@
fv_guest_timelimit="fv-guest-timelimit"
reboot_timelimit="reboot-timelimit"
results_warning_size="results-warning-size"
+ export="export"
class Constants:
12 years, 10 months
r1011 - trunk
by gnichols＠fedoraproject.org
Author: gnichols
Date: 2011-07-15 16:24:03 +0000 (Fri, 15 Jul 2011)
New Revision: 1011
Modified:
trunk/Makefile
Log:
R13
Modified: trunk/Makefile
===================================================================
--- trunk/Makefile 2011-07-13 18:47:49 UTC (rev 1010)
+++ trunk/Makefile 2011-07-15 16:24:03 UTC (rev 1011)
@@ -14,7 +14,7 @@
# Author: Greg Nichols
V7_VERSION := 1.4
-V7_RELEASE := 12
+V7_RELEASE := 13
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, 10 months
r1010 - trunk/v7
by gnichols＠fedoraproject.org
Author: gnichols
Date: 2011-07-13 18:47:49 +0000 (Wed, 13 Jul 2011)
New Revision: 1010
Modified:
trunk/v7/hardwaretest.py
Log:
521609 - v7 plan --server says server has error: /var/v7/export
Modified: trunk/v7/hardwaretest.py
===================================================================
--- trunk/v7/hardwaretest.py 2011-07-13 17:09:48 UTC (rev 1009)
+++ trunk/v7/hardwaretest.py 2011-07-13 18:47:49 UTC (rev 1010)
@@ -554,12 +554,12 @@
print "Status: %s" % match.group("status")
if match.group("status") == Constants.running:
serverRunning = True
- else:
- print "Warning: The v7 server on %s is reporting errors" % server
- for line in response:
- if "Error:" in line:
- sys.stdout.write("%s says: %s" % (server, line))
- return False
+ else:
+ print "Warning: The v7 server on %s is reporting errors" % server
+ for line in response:
+ if "Error:" in line:
+ sys.stdout.write("%s says: %s" % (server, line))
+ return False
else:
"Warning: The V7 server on %s is not running" % server
return False
12 years, 10 months