v7-commits March 2012

v7-commits@lists.stg.fedorahosted.org

1 participants
70 discussions

r1239 - trunk
by gnichols＠fedoraproject.org 23 Mar '12

23 Mar '12

Author: gnichols Date: 2012-03-23 14:51:53 +0000 (Fri, 23 Mar 2012) New Revision: 1239 Modified: trunk/Makefile Log: R11 Modified: trunk/Makefile =================================================================== --- trunk/Makefile 2012-03-22 18:42:25 UTC (rev 1238) +++ trunk/Makefile 2012-03-23 14:51:53 UTC (rev 1239) @@ -14,7 +14,7 @@ # Author: Greg Nichols V7_VERSION := 1.5 -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

1 0

r1238 - tags
by gnichols＠fedoraproject.org 22 Mar '12

22 Mar '12

Author: gnichols Date: 2012-03-22 18:42:25 +0000 (Thu, 22 Mar 2012) New Revision: 1238 Added: tags/v7-V1-5R10/ Log: tag version

1 0

r1237 - trunk
by gnichols＠fedoraproject.org 22 Mar '12

22 Mar '12

Author: gnichols Date: 2012-03-22 18:41:44 +0000 (Thu, 22 Mar 2012) New Revision: 1237 Modified: trunk/v7.spec.in Log: changelog Modified: trunk/v7.spec.in =================================================================== --- trunk/v7.spec.in 2012-03-22 18:40:15 UTC (rev 1236) +++ trunk/v7.spec.in 2012-03-22 18:41:44 UTC (rev 1237) @@ -80,7 +80,14 @@ %changelog +* Thu Mar 22 2012 Greg Nichols <gnichols(a)redhat.com> +V7 1.5 R10 + + 782189 - FEAT: v7 should be able to upload a result directly to a hwcert. + 804492 - V7 should not pass the debug kernel in info when used for hardware tests. + + * Fri Mar 16 2012 Greg Nichols <gnichols(a)redhat.com> V7 1.5 R9

1 0

r1236 - in trunk: tests/info v7
by gnichols＠fedoraproject.org 22 Mar '12

22 Mar '12

Author: gnichols Date: 2012-03-22 18:40:15 +0000 (Thu, 22 Mar 2012) New Revision: 1236 Modified: trunk/tests/info/info.py trunk/v7/redhatrelease.py Log: 804492 - V7 should not pass the debug kernel in info when used for hardware tests. Modified: trunk/tests/info/info.py =================================================================== --- trunk/tests/info/info.py 2012-03-22 18:35:38 UTC (rev 1235) +++ trunk/tests/info/info.py 2012-03-22 18:40:15 UTC (rev 1236) @@ -55,9 +55,15 @@ # print kernel info # this is kind of weird - is this what the hardware catalog expects? print "+ rpm -ql %s" % self.redHatRelease.getKernelRPMName() + success = True - success = self.checkKernelIsGA() + if self.redHatRelease.kernelIsDebug(): + print "Error: debug kernel" + success = False + if not self.checkKernelIsGA(): + success = False + #is the kernel tainted? try: taintedFile = open("/proc/sys/kernel/tainted", "r") Modified: trunk/v7/redhatrelease.py =================================================================== --- trunk/v7/redhatrelease.py 2012-03-22 18:35:38 UTC (rev 1235) +++ trunk/v7/redhatrelease.py 2012-03-22 18:40:15 UTC (rev 1236) @@ -29,6 +29,7 @@ self.kernelRPMName = None self.kernelDevelRPMName = None self.kernelFlavor = None + self.debugKernel = False self._read() self._parse() @@ -84,7 +85,6 @@ self.parseUnameOutput(unameOutput) def parseUnameOutput(self, unameOutput): - self.kernelRPMName = None self.kernelDevelRPMName = "kernel-devel" self.kernelVersionRelease = None @@ -98,6 +98,8 @@ else: self.kernelRPMName = "kernel-%s" % match.group("versionRelease") self.kernelVersionRelease = match.group("versionRelease") + if "debug" in unameOutput: + self.debugKernel = True elif "Red Hat" in self.getProduct() and self.getVersion() >= 5: pattern = re.compile("(?P<versionRelease>.*)\.(?P<product>el[0-9]+)(?P<flavor>xen|PAE|rt)?(?P<arch>.*)$") @@ -114,6 +116,9 @@ self.kernelRPMName = self.kernelRPMName + "rt" self.kernelVersionRelease = match.group("versionRelease") + if match.group("arch"): + if "debug" in match.group("arch"): + self.debugKernel = True elif 'Fedora' in self.getProduct(): pattern = re.compile("(?P<versionRelease>.*)\.(?P<product>fc[0-9]+)(?P<arch>.*)$") @@ -121,7 +126,8 @@ if match: self.kernelRPMName = "kernel-%s.%s%s" % (match.group("versionRelease"), match.group("product"), match.group("arch")) self.kernelVersionRelease = match.group("versionRelease") - + if "debug" in match.group("arch"): + self.debugKernel = True if not self.kernelRPMName: print "Error: could not determine kernel RPM name" self.kernelRPMName = None @@ -160,6 +166,7 @@ def getKernelVersionRelease(self): return self.kernelVersionRelease def getArch(self): return self.arch def getKernelFlavor(self): return self.kernelFlavor + def kernelIsDebug(self): return self.debugKernel def getVersionPointUpdate(self): @@ -223,7 +230,8 @@ "2.6.30.10-105.2.23.fc11.x86_64", "2.6.32.11-99.fc12.x86_64", "2.6.34-0.38.rc5.git0.fc14.x86_64", - "2.6.31.12-1.rt21.1.fc12.ccrma.x86_64") + "2.6.31.12-1.rt21.1.fc12.ccrma.x86_64", + "2.6.32-220.el6.i686.debug") for unameOutput in unameOutputs: @@ -236,9 +244,12 @@ print "kernel devel RPM: " + redHatRelease.getKernelDevelRPMName() if redHatRelease.getKernelFlavor(): print "kernel flavor: " + redHatRelease.getKernelFlavor() + if redHatRelease.kernelIsDebug(): + print "Warning: debug kernel" + else: result = FAILED - + if result is FAILED: print "FAILED" else:

1 0

r1235 - trunk/v7
by gnichols＠fedoraproject.org 22 Mar '12

22 Mar '12

Author: gnichols Date: 2012-03-22 18:35:38 +0000 (Thu, 22 Mar 2012) New Revision: 1235 Modified: trunk/v7/catalog.py trunk/v7/certificationtest.py trunk/v7/hardwaretest.py Log: 782189 - FEAT: v7 should be able to upload a result directly to a hwcert. Modified: trunk/v7/catalog.py =================================================================== --- trunk/v7/catalog.py 2012-03-21 14:23:27 UTC (rev 1234) +++ trunk/v7/catalog.py 2012-03-22 18:35:38 UTC (rev 1235) @@ -23,49 +23,87 @@ from v7.controller import Controller from v7.environment import Environment -from v7.tags import Tags +from v7.tags import Tags, Constants class Catalog(Controller): def __init__(self): Controller.__init__(self) self.environment = Environment() + self.login = None + self.password = None + def getCatalogServer(self): + catalogServer = self.environment.getCatalogURL() + # get just the server URL by stripping off the end of the URL (find the / at least 7 characters from the left). + return catalogServer[0:catalogServer.index('/', 7)] + def isReachable(self): """ check to see that the catalog server is reachable """ - catalogServer = self.environment.getCatalogURL() - # get just the server URL by stripping off the end of the URL (find the / at least 7 characters from the left). - catalogServer = catalogServer[0:catalogServer.index('/', 7)] try: - request = urllib2.urlopen(catalogServer) + request = urllib2.urlopen(self.getCatalogServer()) except Exception, e: print "Could not reach catalog server %s" % catalogServer print e return False return True + + def submit(self, certificationDocument): + if not self.ui.promptConfirm("\nWould you like to submit the results to the hardware catalog?"): + return None + + if certificationDocument.getCertificationID() <= 0: + while True: + id = self.ui.prompt("Please enter the certification ID (ID|new)") + if id == "new": + self.openCertification(certificationDocument) + break + else: + try: + int(id) # make sure it's an integer + certificationDocument.setCertificationID(id) + break + except ValueError: + print "%s is not a valid ID, it must be an integer" + + # opening the cert may have worked, or we had the certification number already. + if certificationDocument.getCertificationID() > 0: + self.submitResults(certificationDocument) + def openCertification(self, certificationDocument): - if not self.ui.promptConfirm("\nWould you like to open a new certification request?"): - return None - tags = [Tags.make, Tags.model, Tags.vendor, Tags.category, Tags.product_url, Tags.arch] hardware = dict() for tag in tags: hardware[tag] = certificationDocument.getHardware(tag) - # get the RHEL version - rhelVersion = certificationDocument.getOS(Tags.release) + # catalog expects i386 for 32-bit x86 + if hardware[Tags.arch] == Constants.i686: + hardware[Tags.arch] = Constants.i386 + + # get the major RHEL version + rhelVersion = certificationDocument.getOS(Tags.release).split(".")[0] - login = self.ui.prompt("Red Hat Catalog User Name: ") - password = self.ui.promptPassword("Password: ") + self.login = self.ui.prompt("Red Hat Catalog User Name: ") + self.password = self.ui.promptPassword("Password: ") serverProxy = xmlrpclib.ServerProxy(self.environment.getCatalogURL()) try: - certificationID = serverProxy.Cert.create(login, password, - hardware[Tags.make], hardware[Tags.model], hardware[Tags.vendor], rhelVersion, - hardware[Tags.arch], hardware[Tags.category], hardware[Tags.product_url]) + params = {"login":self.login, + "password":self.password, + "make":hardware[Tags.make], + "model":hardware[Tags.model], + "vendor":hardware[Tags.vendor], + "version":rhelVersion, + "platform":hardware[Tags.arch], + "category":hardware[Tags.category], + "url":hardware[Tags.product_url]} + response = serverProxy.Cert.create(params) + print "created certification ID %s" % response["id"] + print "%s/show.cgi?id=%s" % (self.getCatalogServer(), response["id"]) + except xmlrpclib.Fault, error: print "Error: could not open a new certification:" print " Fault code: %d" % error.faultCode @@ -76,6 +114,43 @@ print e return None - certificationDocument.setCertificationID(certificationID) + certificationDocument.setCertificationID(response["id"]) - return certificationID + return response["id"] + + def submitResults(self, certificationDocument): + + if certificationDocument.getCertificationID() <= 0: + print "Error: The certification ID: %s is not valid." % certificationDocument.getCertificationID() + return False + + if not self.login or not self.password: + self.login = self.ui.prompt("Red Hat Catalog User Name: ") + self.password = self.ui.promptPassword("Password: ") + + file = "results.xml" + certificationDocument.compressToFile(file) + certificationData = open(file + ".gz", "rb").read().encode("base64") + + serverProxy = xmlrpclib.ServerProxy(self.environment.getCatalogURL()) + try: + params = {"login":self.login, + "password":self.password, + "certid":certificationDocument.getCertificationID(), + "filename":certificationDocument.getVerboseFileName(), + "desc":"test results", + "data":certificationData} + + response = serverProxy.Cert.attachResult(params) + print "results uploaded." + + except xmlrpclib.Fault, error: + print "Error: could not submit certification results:" + print " Fault code: %s" % error.faultCode + print " Fault string: %s" % error.faultString + return None + except Exception, e: + print "Error: could not submit certification results:" + print e + return None + \ No newline at end of file Modified: trunk/v7/certificationtest.py =================================================================== --- trunk/v7/certificationtest.py 2012-03-21 14:23:27 UTC (rev 1234) +++ trunk/v7/certificationtest.py 2012-03-22 18:35:38 UTC (rev 1235) @@ -105,7 +105,7 @@ return longName def getName(self): - # name is: v7-<vendor>-<model>-<os><release>_<arch> + """ v7-<vendor>-<model>-<os><release>_<arch> """ name = "v7-%s-%s-%s%s_%s" % (self.getHardware(Tags.vendor), self.getHardware(Tags.model), self.getOS(Tags.name), self.getOS(Tags.release), self.getHardware(Tags.arch)) return name.replace(" ", "_") @@ -456,6 +456,17 @@ for attachmentElement in self.document.getElementsByTagName(Tags.attachment): attachmentElement.parentNode.removeChild(attachmentElement) + def getVerboseFileName(self): + """ v7-results-<hostname>-<run timestamp>.xml """ + filename = "v7-results" + hostname = self.getOS(Tags.hostname) + if hostname: + filename += "-%s" % hostname + runTime = self.getRunTime() + if runTime: + filename += "-%s" % self.timeStringToTimestamp(runTime) + filename += ".xml" + return filename if __name__ == "__main__": doc = ResultsDocument() doc.load("/var/v7/results.xml") Modified: trunk/v7/hardwaretest.py =================================================================== --- trunk/v7/hardwaretest.py 2012-03-21 14:23:27 UTC (rev 1234) +++ trunk/v7/hardwaretest.py 2012-03-22 18:35:38 UTC (rev 1235) @@ -995,14 +995,10 @@ def __submit(self): if self.certification and self.certification.getNumberOfTestRuns() > 0: if self.options.mode != Constants.auto: - # offer to open a certification in the catalog if there's no id on the results + # optionally submit results to the catalog catalog = Catalog() if catalog.isReachable(): - if self.certification.getCertificationID() <= 0: - catalog.openCertification(self.certification) - # opening the cert may have worked, or we had the certification number already. - if self.certification.getCertificationID() > 0: - catalog.submitResults(self.certification) + catalog.submit(self.certification) report = Report(self.options, self.certification) if report.WriteResultsRPM(self.environment.getLogDirectory()): @@ -1044,15 +1040,7 @@ self.makeDirectoryPath(path) serverPath.append(value) - savedFilename = "v7-results" - hostname = self.certification.getOS(Tags.hostname) - if hostname: - savedFilename += "-%s" % hostname - runTime = self.certification.getRunTime() - print "run time: %s" % runTime - if runTime: - savedFilename += "-%s" % self.certification.timeStringToTimestamp(runTime) - savedFilename += ".xml" + savedFilename = self.certification.getVerboseFileName() print "Saving current results to:" savedFilePath = os.path.join(path, savedFilename) print savedFilePath

1 0

r1234 - trunk
by gnichols＠fedoraproject.org 21 Mar '12

21 Mar '12

Author: gnichols Date: 2012-03-21 14:23:27 +0000 (Wed, 21 Mar 2012) New Revision: 1234 Modified: trunk/Makefile Log: R10 Modified: trunk/Makefile =================================================================== --- trunk/Makefile 2012-03-16 16:47:31 UTC (rev 1233) +++ trunk/Makefile 2012-03-21 14:23:27 UTC (rev 1234) @@ -14,7 +14,7 @@ # Author: Greg Nichols V7_VERSION := 1.5 -V7_RELEASE := 9 +V7_RELEASE := 10 V7_VERSION_RELEASE := $(V7_VERSION)-$(V7_RELEASE) V7_VERSION_PY := v7/version.py V7_SVN_MODULE := svn+ssh://svn.fedorahosted.org/svn/v7

1 0

r1233 - tags
by gnichols＠fedoraproject.org 16 Mar '12

16 Mar '12

Author: gnichols Date: 2012-03-16 16:47:31 +0000 (Fri, 16 Mar 2012) New Revision: 1233 Added: tags/v7-V1-5R9/ Log: tag version

1 0

r1232 - trunk
by gnichols＠fedoraproject.org 16 Mar '12

16 Mar '12

Author: gnichols Date: 2012-03-16 16:47:08 +0000 (Fri, 16 Mar 2012) New Revision: 1232 Modified: trunk/Makefile Log: R9 Modified: trunk/Makefile =================================================================== --- trunk/Makefile 2012-03-16 16:46:48 UTC (rev 1231) +++ trunk/Makefile 2012-03-16 16:47:08 UTC (rev 1232) @@ -14,7 +14,7 @@ # Author: Greg Nichols V7_VERSION := 1.5 -V7_RELEASE := 8 +V7_RELEASE := 9 V7_VERSION_RELEASE := $(V7_VERSION)-$(V7_RELEASE) V7_VERSION_PY := v7/version.py V7_SVN_MODULE := svn+ssh://svn.fedorahosted.org/svn/v7

1 0

r1231 - trunk
by gnichols＠fedoraproject.org 16 Mar '12

16 Mar '12

Author: gnichols Date: 2012-03-16 16:46:48 +0000 (Fri, 16 Mar 2012) New Revision: 1231 Modified: trunk/v7.spec.in Log: changelog Modified: trunk/v7.spec.in =================================================================== --- trunk/v7.spec.in 2012-03-16 16:46:22 UTC (rev 1230) +++ trunk/v7.spec.in 2012-03-16 16:46:48 UTC (rev 1231) @@ -79,6 +79,21 @@ %changelog + + +* Fri Mar 16 2012 Greg Nichols <gnichols(a)redhat.com> + +V7 1.5 R9 + + 767059 - info: kmod rpm verify command is not running + 687990 - FV_CORE INFO test fails because sosreport expects user response + 799897 - v7 server starts/stops returns 1 + 752753 - v7 server status reporting /var/v7/export is exported in v7-1.4 + 748753 - Unicode decode error in /var/log/messages + 747990 - interactive tests run in --mode auto should fail -- code clean up part + 750721 - audio: Warning: could not log sound card information + 755473 - v7-server traceback: No such file or directory: u'/var/v7/results.xml + * Fri Mar 09 2012 Greg Nichols <gnichols(a)redhat.com> V7 1.5 R8

1 0

r1230 - trunk/tests/info
by gnichols＠fedoraproject.org 16 Mar '12

16 Mar '12

Author: gnichols Date: 2012-03-16 16:46:22 +0000 (Fri, 16 Mar 2012) New Revision: 1230 Modified: trunk/tests/info/Makefile Log: added kernelInfo.xml Modified: trunk/tests/info/Makefile =================================================================== --- trunk/tests/info/Makefile 2012-03-16 16:42:04 UTC (rev 1229) +++ trunk/tests/info/Makefile 2012-03-16 16:46:22 UTC (rev 1230) @@ -16,17 +16,11 @@ .PHONY: all install download clean BUILT_FILES= -FILES=runtest.sh info.py +FILES=runtest.sh kernelInfo.xml run: $(FILES) build ./runtest.sh -build: $(BUILT_FILES) - chmod a+x ./runtest.sh ./info.py - -clean: - rm -f $(BUILT_FILES) - # Include Common Makefile include $(DESTDIR)/usr/share/v7/lib/v7-make.include

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

v7-commits March 2012