r432 - in tags: . v7-V1-1R14/v7
by gnichols＠fedoraproject.org
Author: gnichols
Date: 2010-03-09 03:55:26 +0000 (Tue, 09 Mar 2010)
New Revision: 432
Added:
tags/v7-V1-1R14/
tags/v7-V1-1R14/v7/version.py
Log:
tag version
Copied: tags/v7-V1-1R14 (from rev 431, trunk)
Copied: tags/v7-V1-1R14/v7/version.py (from rev 335, trunk/v7/version.py)
===================================================================
--- tags/v7-V1-1R14/v7/version.py (rev 0)
+++ tags/v7-V1-1R14/v7/version.py 2010-03-09 03:55:26 UTC (rev 432)
@@ -0,0 +1,5 @@
+
+# v7/version.py is automatically-generated - DO NOT EDIT
+version = '1.1'
+release = '14'
+rhel_version = '5'
14 years, 2 months
r431 - trunk/v7
by gnichols＠fedoraproject.org
Author: gnichols
Date: 2010-03-09 03:53:31 +0000 (Tue, 09 Mar 2010)
New Revision: 431
Modified:
trunk/v7/fvtest.py
Log:
570637 - kvm test needs RHEL-release-specific packages
Modified: trunk/v7/fvtest.py
===================================================================
--- trunk/v7/fvtest.py 2010-03-09 03:48:53 UTC (rev 430)
+++ trunk/v7/fvtest.py 2010-03-09 03:53:31 UTC (rev 431)
@@ -32,6 +32,7 @@
from v7.command import Command, V7CommandException
from v7.environment import Environment
from v7.certificationtest import CertificationDocument
+from v7.redhatrelease import RedHatRelease
PASSED = 0
FAILED = 1
@@ -56,6 +57,7 @@
self.waitTime = 60 # in minutes
self.environment = Environment()
self.debug = Constants.off
+ self.redHatRelease = RedHatRelease()
self.__getHypervisor()
if self.hypervisor == Constants.xen:
14 years, 2 months
r430 - trunk
by gnichols＠fedoraproject.org
Author: gnichols
Date: 2010-03-09 03:48:53 +0000 (Tue, 09 Mar 2010)
New Revision: 430
Modified:
trunk/v7.spec.in
Log:
changelog
Modified: trunk/v7.spec.in
===================================================================
--- trunk/v7.spec.in 2010-03-09 03:06:23 UTC (rev 429)
+++ trunk/v7.spec.in 2010-03-09 03:48:53 UTC (rev 430)
@@ -68,6 +68,16 @@
/usr/share/man/man8/v7.8.gz
%changelog
+* Mon Mar 08 2010 Greg Nichols <gnichols(a)redhat.com>
+
+V7 1.1 R14
+
+ 568468 - v7 finds no RT kernel ABI Whitelist
+ 571599 - info test traceback on info test v7 rpm verification
+ 568226 - USB test failed on RHEL48 with v7 R9.
+ 570637 - kvm test needs RHEL-release-specific packages
+ 570917 - FV KVM tests causes selinux errors
+
* Fri Mar 05 2010 Greg Nichols <gnichols(a)redhat.com>
V7 1.1 R13
14 years, 2 months
r429 - trunk/v7
by gnichols＠fedoraproject.org
Author: gnichols
Date: 2010-03-09 03:06:23 +0000 (Tue, 09 Mar 2010)
New Revision: 429
Modified:
trunk/v7/fvtest.py
Log:
570917 - FV KVM tests causes selinux errors
Modified: trunk/v7/fvtest.py
===================================================================
--- trunk/v7/fvtest.py 2010-03-09 03:01:07 UTC (rev 428)
+++ trunk/v7/fvtest.py 2010-03-09 03:06:23 UTC (rev 429)
@@ -190,13 +190,14 @@
os.system("wget " + url)
try:
if os.path.exists(filename + ".tar.bz2"):
- unpackedFilename = Command("tar xvf " + filename + ".tar.bz2").getString()
- os.remove(filename + ".tar.bz2")
- # move it to the right place
- shutil.move(unpackedFilename, os.path.join(destinationDirectory, filename))
- # do we need to do a chcon here?
- print "Downloaded " + filename + " to " + destinationDirectory
- return True
+ unpackedFilename = Command("tar xvf " + filename + ".tar.bz2").getString()
+ os.remove(filename + ".tar.bz2")
+ # move it to the right place
+ shutil.move(unpackedFilename, os.path.join(destinationDirectory, filename))
+ restorecon = Command("/sbin/restorecon -v " + os.path.join(destinationDirectory, filename))
+ restorecon.echo()
+ print "Downloaded " + filename + " to " + destinationDirectory
+ return True
else:
print "Note: could not download " + url
except Exception, e:
14 years, 2 months
r428 - trunk/v7
by gnichols＠fedoraproject.org
Author: gnichols
Date: 2010-03-09 03:01:07 +0000 (Tue, 09 Mar 2010)
New Revision: 428
Modified:
trunk/v7/fvtest.py
Log:
570637 - kvm test needs RHEL-release-specific packages
Modified: trunk/v7/fvtest.py
===================================================================
--- trunk/v7/fvtest.py 2010-03-09 02:58:58 UTC (rev 427)
+++ trunk/v7/fvtest.py 2010-03-09 03:01:07 UTC (rev 428)
@@ -119,7 +119,13 @@
def getRequiredRPMs(self):
rpms = ["libvirt", "libvirt-python", "python-virtinst"]
if self.hypervisor == Constants.kvm:
- rpms.append('qemu')
+ if "Fedora" in self.redHatRelease.getProduct():
+ rpms.append('qemu')
+ elif "Red Hat" in self.redHatRelease.getProduct():
+ if self.redHatRelease.getVersion() is 5:
+ rpms.append('kvm-tools')
+ elif self.redHatRelease.getVersion() is 6:
+ rpms.append("qemu-kvm-tools")
return rpms
def verifyGuest(self):
14 years, 2 months
r427 - trunk/v7
by gnichols＠fedoraproject.org
Author: gnichols
Date: 2010-03-09 02:58:58 +0000 (Tue, 09 Mar 2010)
New Revision: 427
Modified:
trunk/v7/procDeviceDetector.py
Log:
568226 - USB test failed on RHEL48 with v7 R9.
Modified: trunk/v7/procDeviceDetector.py
===================================================================
--- trunk/v7/procDeviceDetector.py 2010-03-09 02:53:15 UTC (rev 426)
+++ trunk/v7/procDeviceDetector.py 2010-03-09 02:58:58 UTC (rev 427)
@@ -7,13 +7,14 @@
from v7.device import ProcDevice
from v7.deviceDetector import DeviceDetector
from v7.tags import Constants
+from v7.command import Command
class ProcDeviceDetector(DeviceDetector):
"A class for detecting devices via the /proc file system"
def __init__(self):
DeviceDetector.__init__(self, name=Constants.proc)
- self.usbPath = "/proc/bus/usbXXX/devices"
+ self.usbPath = "/proc/bus/usb/devices"
self.nextKey = None
self.__loadDevices()
@@ -25,7 +26,7 @@
# treat the file as a bunch of attrubute=value strings
# sepearated by blank lines for each device
try:
- pipe = Command(self.usbPath)
+ pipe = Command("cat " + self.usbPath)
pipe.start()
properties = dict()
while 1:
@@ -52,9 +53,8 @@
for keyvalue in keyvalues:
self.__addKeyValue(keyvalue, properties)
except Exception, e:
- if self.debug != Constants.off:
- print "Warning: could not read devices from proc"
- print e
+ print "Warning: could not read devices from proc"
+ print e
pass
def __addKeyValue(self, keyvalue, properties):
14 years, 2 months
r426 - trunk/tests/info
by gnichols＠fedoraproject.org
Author: gnichols
Date: 2010-03-09 02:53:15 +0000 (Tue, 09 Mar 2010)
New Revision: 426
Modified:
trunk/tests/info/info.py
Log:
571599 - info test traceback on info test v7 rpm verification
Modified: trunk/tests/info/info.py
===================================================================
--- trunk/tests/info/info.py 2010-03-09 01:18:06 UTC (rev 425)
+++ trunk/tests/info/info.py 2010-03-09 02:53:15 UTC (rev 426)
@@ -87,7 +87,7 @@
rpmVerify = Command("rpm -V --nomtime --nomode --nocontexts v7")
try:
rpmVerify.echo()
- if len(rpmVerify.output) > 0 and "not installed" in rpmVerify.output[0]:
+ if rpmVerify.output and len(rpmVerify.output) > 0 and "not installed" in rpmVerify.output[0]:
return False
return True
except V7CommandException, e:
14 years, 2 months
r425 - trunk/tests/info
by gnichols＠fedoraproject.org
Author: gnichols
Date: 2010-03-09 01:18:06 +0000 (Tue, 09 Mar 2010)
New Revision: 425
Modified:
trunk/tests/info/info.py
Log:
568468 - v7 finds no RT kernel ABI Whitelist
Modified: trunk/tests/info/info.py
===================================================================
--- trunk/tests/info/info.py 2010-03-09 01:16:52 UTC (rev 424)
+++ trunk/tests/info/info.py 2010-03-09 01:18:06 UTC (rev 425)
@@ -32,82 +32,20 @@
self.redHatRelease = RedHatRelease()
print "Tested OS: %s %s (%s)" % (self.redHatRelease.getProduct(), self.redHatRelease.getVersion(), self.redHatRelease.getCodeName())
-
-
- self.getKernelRPMName()
- print "Kernel RPM: %s" % self.kernelRPMName
+ print "Kernel RPM: %s" % self.redHatRelease.getKernelRPMName()
# YK: to show v7 version as well
print "v7 version %s, release %s" % (v7.version.version, v7.version.release)
self.priority = 1000 # run last
def getRequiredRPMs(self):
# kernel-devel or varient is required for the ABI whitelist
- rpms = [self.kernelDevelRPMName]
- return rpms
-
-
- def getKernelRPMName(self):
- uname = os.popen('uname -r')
- self.kernel = uname.readline()[:-1]
- uname.close()
-
- uname = os.popen('uname -m')
- self.arch = uname.readline()[:-1]
- uname.close()
-
- uname = os.popen("uname -r")
- unameOutput = uname.readline()
- if not unameOutput:
- print "Error: uname failed"
- else:
- unameOutput = unameOutput.strip()
-
- self.kernelRPMName = None
- self.kernelDevelRPMName = "kernel-devel"
- if "Red Hat" in self.redHatRelease.getProduct() and self.redHatRelease.getVersion() == 4:
- pattern = re.compile("(?P<versionRelease>[^a-z]*)(?P<name>smp|hugemem|largesmp)?$")
- match = pattern.search(unameOutput)
- if match:
- # if the release ends with ELsmp, ELhugemem, or ELlargesmp
- if match.group("name"):
- self.kernelRPMName = "kernel-%s-%s" % (match.group("name"), match.group("versionRelease"))
- else:
- self.kernelRPMName = "kernel-%s" % match.group("versionRelease")
-
- elif "Red Hat" in self.redHatRelease.getProduct() and self.redHatRelease.getVersion() == 5:
- pattern = re.compile("(?P<versionRelease>[^a-z]*)(?P<product>el5)(?P<flavor>xen|PAE|rt)?$")
- match = pattern.search(unameOutput)
- if match:
- flavor = ""
- if match.group("flavor"):
- flavor = "%s-" % match.group("flavor")
- self.kernelRPMName = "kernel-%s%s%s" % (flavor, match.group("versionRelease"), match.group("product"))
- self.kernelDevelRPMName = "kernel-%sdevel" % flavor
- # RT kernel tags rt on the end of el5
- if match.group("flavor") == "rt":
- self.kernelRPMName = self.kernelRPMName + "rt"
- self.kernelDevelRPMName = kernelDevelRPMName + "rt"
-
- elif 'Fedora' in self.redHatRelease.getProduct():
- print "looking for Fedora kernel"
- print unameOutput
- pattern = re.compile("(?P<versionRelease>[^a-z]*)(?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"))
-
-
- if not self.kernelRPMName:
- print "Error: could not determine kernel RPM name"
- self.kernelRPMName = None
-
- uname.close()
-
+ rpms = [self.redHatRelease.getKernelDevelRPMName()]
+ return rpms
def checkKernel(self):
# print kernel info
# this is kind of weird - is this what the hardware catalog expects?
- print "+ rpm -ql %s" % self.kernelRPMName
+ print "+ rpm -ql %s" % self.redHatRelease.getKernelRPMName()
success = True
#is the kernel tainted?
@@ -125,12 +63,12 @@
success = False
#where files modified?
- if not os.system("rpm -V --nomtime --nomode --nocontexts %s" % self.kernelRPMName) is 0:
- print "Error: files from %s were modified" % self.kernelRPMName
+ if not os.system("rpm -V --nomtime --nomode --nocontexts %s" % self.redHatRelease.getKernelRPMName()) is 0:
+ print "Error: files from %s were modified" % self.redHatRelease.getKernelRPMName()
success = False
#check the buildhost
- if not os.system("rpm -q %s --qf '%%{buildhost}\n\' | grep -q redhat.com" % self.kernelRPMName) is 0:
+ if not os.system("rpm -q %s --qf '%%{buildhost}\n\' | grep -q redhat.com" % self.redHatRelease.getKernelRPMName()) is 0:
print "Error: This kernel was not built by Red Hat!"
success = False
@@ -176,7 +114,7 @@
print "checking modules..."
sys.stdout.flush()
kernelRPMModuleList = list()
- pipe = os.popen("rpm -ql %s | tr _ - " % self.kernelRPMName)
+ pipe = os.popen("rpm -ql %s | tr _ - " % self.redHatRelease.getKernelRPMName())
while True:
line = pipe.readline()
if line:
@@ -332,13 +270,16 @@
def abiCheck(self, module):
- whitelist = '/usr/src/kernels/%s-%s/kabi_whitelist' % (self.kernel, self.arch)
+ # skip abi checks for rt kernel
+ if self.redHatRelease.getKernelFlavor() == Constants.rt:
+ return True
+ whitelist = '/usr/src/kernels/%s-%s/kabi_whitelist' % (self.redHatRelease.getKernel(), self.arch)
print "Red Hat Enterprise Linux %u ABI" % self.redHatRelease.getVersion()
print "--------------------------------"
print ""
print "Module: " + module
- print "Kernel: " + self.kernel
+ print "Kernel: " + self.redHatRelease.getKernel()
print "Whitelist: " + whitelist
print ""
14 years, 2 months
r424 - trunk/v7
by gnichols＠fedoraproject.org
Author: gnichols
Date: 2010-03-09 01:16:52 +0000 (Tue, 09 Mar 2010)
New Revision: 424
Modified:
trunk/v7/redhatrelease.py
Log:
568468 - v7 finds no RT kernel ABI Whitelist
Modified: trunk/v7/redhatrelease.py
===================================================================
--- trunk/v7/redhatrelease.py 2010-03-09 01:16:27 UTC (rev 423)
+++ trunk/v7/redhatrelease.py 2010-03-09 01:16:52 UTC (rev 424)
@@ -24,8 +24,15 @@
self.codeName = None
self.candidate = None
self.valid = False
+ self.kernel = None
+ self.arch = None
+ self.kernelRPMName = None
+ self.kernelDevelRPMName = None
+ self.kernelFlavor = None
+
self._read()
self._parse()
+ self.__getKernelInfo()
def _read(self):
f=open("/etc/redhat-release")
@@ -58,7 +65,61 @@
if match.group("candidate") and len(match.group("candidate").strip()) > 0:
self.candidate = match.group("candidate").strip()
-
+ def __getKernelInfo(self):
+ uname = os.popen('uname -r')
+ self.kernel = uname.readline()[:-1]
+ uname.close()
+
+ uname = os.popen('uname -m')
+ self.arch = uname.readline()[:-1]
+ uname.close()
+
+ uname = os.popen("uname -r")
+ unameOutput = uname.readline()
+ if not unameOutput:
+ print "Error: uname failed"
+ else:
+ unameOutput = unameOutput.strip()
+
+ self.kernelRPMName = None
+ self.kernelDevelRPMName = "kernel-devel"
+ 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)
+ if match:
+ # if the release ends with ELsmp, ELhugemem, or ELlargesmp
+ if match.group("name"):
+ self.kernelRPMName = "kernel-%s-%s" % (match.group("name"), match.group("versionRelease"))
+ else:
+ self.kernelRPMName = "kernel-%s" % match.group("versionRelease")
+
+ elif "Red Hat" in self.getProduct() and self.getVersion() == 5:
+ pattern = re.compile("(?P<versionRelease>[^a-z]*)(?P<product>el5)(?P<flavor>xen|PAE|rt)?$")
+ match = pattern.search(unameOutput)
+ if match:
+ flavor = ""
+ if match.group("flavor"):
+ self.kernelFlavor = match.group("flavor")
+ flavor = "%s-" % match.group("flavor")
+ self.kernelRPMName = "kernel-%s%s%s" % (flavor, match.group("versionRelease"), match.group("product"))
+ self.kernelDevelRPMName = "kernel-%sdevel" % flavor
+ # RT kernel tags rt on the end of el5
+ if match.group("flavor") == "rt":
+ self.kernelRPMName = self.kernelRPMName + "rt"
+ self.kernelDevelRPMName = kernelDevelRPMName + "rt"
+
+ elif 'Fedora' in self.getProduct():
+ pattern = re.compile("(?P<versionRelease>[^a-z]*)(?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"))
+
+ if not self.kernelRPMName:
+ print "Error: could not determine kernel RPM name"
+ self.kernelRPMName = None
+
+ uname.close()
+
def isValid(self):
return self.valid and self.product and self.version and self.codeName
@@ -69,13 +130,21 @@
def getUpdate(self): return self.update
def getCodeName(self): return self.codeName
def getCandidate(self): return self.candidate
+ def getKernelRPMName(self): return self.kernelRPMName
+ def getKernelDevelRPMName(self): return self.kernelDevelRPMName
+ def getKernel(self): return self.kernel
+ def getArch(self): return self.arch
+ def getKernelFlavor(self): return self.kernelFlavor
+
def getVersionPointUpdate(self):
if self.update:
return "%u.%u" % (self.version, self.update)
else:
return "%u" % self.version
+
+
def dump(self):
print ""
print self.text
@@ -105,6 +174,16 @@
redHatRelease.text = "Red Hat Enterprise Linux Server release 5.5 Beta (Tikanga)"
redHatRelease._parse()
redHatRelease.dump()
+
+ print "\nTest uname parsing:"
+ redHatRelease = RedHatRelease()
+ print "kernel: " + redHatRelease.getKernel()
+ print "arch: " + redHatRelease.getArch()
+ print "kernel RPM: " + redHatRelease.getKernelRPMName()
+ print "kernel devel RPM: " + redHatRelease.getKernelDevelRPMName()
+ if redHatRelease.getKernelFlavor():
+ print "kernel flavor: " + redHatRelease.getKernelFlavor()
+
14 years, 2 months
r423 - trunk
by gnichols＠fedoraproject.org
Author: gnichols
Date: 2010-03-09 01:16:27 +0000 (Tue, 09 Mar 2010)
New Revision: 423
Modified:
trunk/Makefile
Log:
R14
Modified: trunk/Makefile
===================================================================
--- trunk/Makefile 2010-03-05 19:23:28 UTC (rev 422)
+++ trunk/Makefile 2010-03-09 01:16:27 UTC (rev 423)
@@ -14,7 +14,7 @@
# Author: Greg Nichols
V7_VERSION := 1.1
-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
14 years, 2 months