r1009 - tags
by gnichols＠fedoraproject.org
Author: gnichols
Date: 2011-07-13 17:09:48 +0000 (Wed, 13 Jul 2011)
New Revision: 1009
Added:
tags/v7-V1-4R12/
Log:
tag version
12 years, 10 months
r1008 - trunk
by gnichols＠fedoraproject.org
Author: gnichols
Date: 2011-07-13 17:08:59 +0000 (Wed, 13 Jul 2011)
New Revision: 1008
Modified:
trunk/v7.spec.in
Log:
changelog
Modified: trunk/v7.spec.in
===================================================================
--- trunk/v7.spec.in 2011-07-13 17:08:38 UTC (rev 1007)
+++ trunk/v7.spec.in 2011-07-13 17:08:59 UTC (rev 1008)
@@ -79,7 +79,7 @@
%changelog
* Wed Jul 13 2011 Greg Nichols <gnichols(a)redhat.com>
-V7 1.4 R11
+V7 1.4 R12
521609 - v7 plan --server says server has error: /var/v7/export
12 years, 10 months
r1007 - trunk
by gnichols＠fedoraproject.org
Author: gnichols
Date: 2011-07-13 17:08:38 +0000 (Wed, 13 Jul 2011)
New Revision: 1007
Modified:
trunk/Makefile
Log:
R12
Modified: trunk/Makefile
===================================================================
--- trunk/Makefile 2011-07-13 17:08:09 UTC (rev 1006)
+++ trunk/Makefile 2011-07-13 17:08:38 UTC (rev 1007)
@@ -14,7 +14,7 @@
# Author: Greg Nichols
V7_VERSION := 1.4
-V7_RELEASE := 11
+V7_RELEASE := 12
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
r1006 - trunk/v7
by gnichols＠fedoraproject.org
Author: gnichols
Date: 2011-07-13 17:08:09 +0000 (Wed, 13 Jul 2011)
New Revision: 1006
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 16:25:03 UTC (rev 1005)
+++ trunk/v7/hardwaretest.py 2011-07-13 17:08:09 UTC (rev 1006)
@@ -455,10 +455,12 @@
# check server=specific rpms
if subcommand == "start":
# server web CGI uses XSLT via python-lxml
- if not self.installRequiredRPMs({"python-lxml": "python-lxml", "fence-agents": "fence-agents"}):
+ if not self.installRequiredRPMs({"fence-agents": "fence-agents"}):
result = 1
for test in tests:
+ print "%s test server %s:" % (test.Name(), subcommand)
rv = self.runServer(test, subcommand)
+ print ""
if rv != 0:
result = rv
@@ -511,11 +513,14 @@
planner.analyse(self.environment.getSourceDirectory())
tests = planner.getServerModeTests();
print "</pre>V7 Server Status:<pre>"
+ self.doVersion()
+ print ""
success = True
-
for test in tests:
+ print "%s server:" % test.Name()
if not test.statusServer():
success = False
+ print ""
print "</pre>"
if success:
print "<!-- %s=%s -->" % (Constants.v7serverstatus, Constants.running)
@@ -530,7 +535,7 @@
request = urllib2.Request('http://%s/v7/cgi/v7web.py?command=status' % server)
opener = urllib2.build_opener()
response = opener.open(request).readlines()
- nvrPattern = re.compile("%s[^0-9]+(?P<version>[0-9]+\.[0-9]+)[^0-9]+(?P<release>[0-9]+)" % Constants.v7)
+ nvrPattern = re.compile("%s[^0-9]+(?P<version>[0-9]+\.[0-9]+)[^0-9]+(?P<release>[0-9]+)" % Constants.V7)
statusPattern = re.compile("%s=(?P<status>[a-zA-Z]+)" % Constants.v7serverstatus)
serverRunning = False
if response:
@@ -1098,22 +1103,13 @@
return rv
def runServer(self, test, subcommand):
- "Run a test server"
- testDirectory = self.environment.getSourceDirectory()+"/"+test.Name()
- if self.Debugging:
- print "HardwareTestHarness.runServer:"
- print " test directory %s" % (testDirectory)
- cwd=os.getcwd()
- os.chdir(testDirectory)
- runCommand = "make server %s=%s" % (
- Constants.RUNMODE, subcommand,
- )
- print runCommand
- rv = os.WEXITSTATUS(os.system(runCommand))
- os.chdir(cwd)
- if self.Debugging:
- print "...Done: return value = %u." % rv
- return rv
+ if subcommand == "start":
+ return test.startServer()
+ if subcommand == "stop":
+ return test.stopServer()
+
+ # otherwise
+ return test.statusServer()
def saveSystemLog(self, test, run):
"Save a section of the system log to the named file"
12 years, 10 months
r1005 - tags
by gnichols＠fedoraproject.org
Author: gnichols
Date: 2011-07-13 16:25:03 +0000 (Wed, 13 Jul 2011)
New Revision: 1005
Added:
tags/v7-V1-4R11/
Log:
tag version
12 years, 10 months
r1004 - trunk
by gnichols＠fedoraproject.org
Author: gnichols
Date: 2011-07-13 16:24:27 +0000 (Wed, 13 Jul 2011)
New Revision: 1004
Modified:
trunk/v7.spec.in
Log:
changelog
Modified: trunk/v7.spec.in
===================================================================
--- trunk/v7.spec.in 2011-07-13 16:24:05 UTC (rev 1003)
+++ trunk/v7.spec.in 2011-07-13 16:24:27 UTC (rev 1004)
@@ -77,6 +77,12 @@
%changelog
+* Wed Jul 13 2011 Greg Nichols <gnichols(a)redhat.com>
+
+V7 1.4 R11
+
+ 521609 - v7 plan --server says server has error: /var/v7/export
+
* Tue Jul 12 2011 Greg Nichols <gnichols(a)redhat.com>
V7 1.4 R10
12 years, 10 months
r1003 - trunk/v7
by gnichols＠fedoraproject.org
Author: gnichols
Date: 2011-07-13 16:24:05 +0000 (Wed, 13 Jul 2011)
New Revision: 1003
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-13 16:22:43 UTC (rev 1002)
+++ trunk/v7/tags.py 2011-07-13 16:24:05 UTC (rev 1003)
@@ -145,7 +145,7 @@
memory = "mem"
disk = "disk"
v7serverstatus = "v7serverstatus"
- v7serverMinimumVersion = "1.3"
+ v7serverMinimumVersion = "1.4"
running = "running"
failed = "failed"
V7 = "V7"
12 years, 10 months
r1002 - in trunk/tests: kdump network
by gnichols＠fedoraproject.org
Author: gnichols
Date: 2011-07-13 16:22:43 +0000 (Wed, 13 Jul 2011)
New Revision: 1002
Modified:
trunk/tests/kdump/kdump.py
trunk/tests/network/network.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-13 16:22:12 UTC (rev 1001)
+++ trunk/tests/kdump/kdump.py 2011-07-13 16:22:43 UTC (rev 1002)
@@ -40,7 +40,9 @@
self.coreCollector = "makedumpfile -d 31"
self.kdumpConfigPath = "/etc/kdump.conf"
self.redHatRelease = RedHatRelease()
+ self.serverMode = True # nfs for kdump to nfs
+
def getRequiredRPMs(self):
rpms = ["kexec-tools", "crash"]
variantString = ""
@@ -69,7 +71,48 @@
def tags(self):
# nanny-prompting in --mode normal, will run --mode auto
return [TestTag.noninteractive, TestTag.certification]
+
+ def startServer(self):
+ os.system("service nfs start")
+ dataDirectory = self.environment.getDataDirectory()
+ exportDirectory = dataDirectory + '/export'
+ for directory in (dataDirectory, exportDirectory):
+ try:
+ os.mkdir(directory)
+ print "Created %s" % directory
+ except OSError: # file probably exists
+ if not os.path.exists(directory):
+ print "Warning: unable to create directory %s." % directory
+ if os.system("exportfs -o rw,no_root_squash,insecure *:%s" % exportDirectory):
+ print "Error: could not export %s" % exportDirectory
+
+ def stopServer(self):
+ # nfs
+ os.system("service nfs stop")
+
+ def statusServer(self):
+ result = True
+ try:
+ # 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)
+ print "%s/export is exported" % self.environment.getDataDirectory()
+ except V7CommandException, exception:
+ print "Error: %s/export is not available" % self.environment.getDataDirectory()
+ result = False
+
+ try:
+ serviceNFSStatus = Command("service nfs status")
+ print "%s:" % serviceNFSStatus.command
+ serviceNFSStatus.echo()
+ except V7CommandException, exception:
+ print exception
+ result = False
+
+ return result
+
def configureKDump(self):
verified = True
# log required rpms installation
@@ -136,7 +179,9 @@
print "Network Dump set to %s" % net
elif self.getLogicalDeviceName() == Constants.nfs:
if self.getTestServer() and self.getTestServer() != "unknown":
- net = "%s:/var/v7/export" % self.getTestServer()
+ # 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())
print "Adding net %s to %s" % (net, self.kdumpConfigPath)
configFile.addParameter("net", net)
restart = True
Modified: trunk/tests/network/network.py
===================================================================
--- trunk/tests/network/network.py 2011-07-13 16:22:12 UTC (rev 1001)
+++ trunk/tests/network/network.py 2011-07-13 16:22:43 UTC (rev 1002)
@@ -434,20 +434,6 @@
else:
print " done."
- # nfs - leaving in so we can test prior v7 clients.
- os.system("service nfs start")
- dataDirectory = self.environment.getDataDirectory()
- exportDirectory = dataDirectory + '/export'
- for directory in (dataDirectory, exportDirectory):
- try:
- os.mkdir(directory)
- print "Created %s" % directory
- except OSError: # file probably exists
- if not os.path.exists(directory):
- print "Warning: unable to create directory %s." % directory
-
- if os.system("exportfs -o rw,no_root_squash,insecure *:%s" % exportDirectory):
- print "Error: could not export %s" % exportDirectory
# httpd
os.system("service httpd start")
@@ -470,8 +456,7 @@
os.system("bw_tcp -S localhost")
os.system("lat_udp -S localhost")
print " done."
- # nfs
- os.system("service nfs stop")
+
# httpd
os.system("service httpd stop")
@@ -486,16 +471,8 @@
except V7CommandException:
print "Error: lmbench %s is NOT running" % tool
result = False
-
- try:
- Command("exportfs").getString(regex=".*%s/export" % self.environment.getDataDirectory(), singleLine=False)
- print "%s/export is exported" % self.environment.getDataDirectory()
- except V7CommandException:
- print "Error: %s/export is not available" % self.environment.getDataDirectory()
- result = False
try:
- Command("service nfs status ").echo()
# httpd
Command("service httpd status").echo()
except V7CommandException, exception:
12 years, 10 months
r1001 - trunk
by gnichols＠fedoraproject.org
Author: gnichols
Date: 2011-07-13 16:22:12 +0000 (Wed, 13 Jul 2011)
New Revision: 1001
Modified:
trunk/Makefile
Log:
R11
Modified: trunk/Makefile
===================================================================
--- trunk/Makefile 2011-07-12 10:51:11 UTC (rev 1000)
+++ trunk/Makefile 2011-07-13 16:22:12 UTC (rev 1001)
@@ -14,7 +14,7 @@
# Author: Greg Nichols
V7_VERSION := 1.4
-V7_RELEASE := 10
+V7_RELEASE := 11
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
r1000 - tags
by gnichols＠fedoraproject.org
Author: gnichols
Date: 2011-07-12 10:51:11 +0000 (Tue, 12 Jul 2011)
New Revision: 1000
Added:
tags/v7-V1-4R10/
Log:
tag version
12 years, 10 months