January 2010 - v7-commits - Fedora mailing-lists

r306 - trunk
by gnichols＠fedoraproject.org 12 Jan '10

12 Jan '10

Author: gnichols Date: 2010-01-13 01:11:32 +0000 (Wed, 13 Jan 2010) New Revision: 306 Modified: trunk/v7.spec.in Log: changelog Modified: trunk/v7.spec.in =================================================================== --- trunk/v7.spec.in 2010-01-13 01:02:32 UTC (rev 305) +++ trunk/v7.spec.in 2010-01-13 01:11:32 UTC (rev 306) @@ -68,6 +68,16 @@ /usr/share/man/man8/v7.8.gz %changelog +* Tue Jan 12 2010 Greg Nichols <gnichols(a)redhat.com> + +V7 1.0 R23 + + 554915 - FEAT: v7 needs a RTEval test + 523824 - FEAT: v7 should fv_* tests should support KVM + 488145 - FEAT: HTS should provide a run-time dependency option for installation + 474856 - CPUScaling Fails in HTS 5.3-3 + + * Thu Dec 17 2009 Greg Nichols <gnichols(a)redhat.com> V7 1.0 R21

1 0

r305 - trunk/tests/rteval
by gnichols＠fedoraproject.org 12 Jan '10

12 Jan '10

Author: gnichols Date: 2010-01-13 01:02:32 +0000 (Wed, 13 Jan 2010) New Revision: 305 Modified: trunk/tests/rteval/v7_rteval.py Log: 554915 - FEAT: v7 needs a RTEval test Modified: trunk/tests/rteval/v7_rteval.py =================================================================== --- trunk/tests/rteval/v7_rteval.py 2010-01-13 00:55:20 UTC (rev 304) +++ trunk/tests/rteval/v7_rteval.py 2010-01-13 01:02:32 UTC (rev 305) @@ -54,12 +54,8 @@ # If one of the /sys/class/dmi/id files is missing, abort this test planning return () - # Prepare rteval - import rteval.rteval + - args = ['-d', '4h'] - self.rteval = rteval.rteval.RtEval(args) - ret = list() ret.append(self.makeCopy()) return ret @@ -68,8 +64,19 @@ def run(self): FAILED = 1 PASSED = 0 - - if self.rteval.rteval() != 0: + + # Prepare rteval + try: + import rteval.rteval + + args = ['-d', '4h'] + self.rteval = rteval.rteval.RtEval(args) + + if self.rteval.rteval() != 0: + print "Error: could not intitialize RTEval" + return FAILED + except Exception, e: + print "Error: could not intitialize RTEval" return FAILED # Analyse the result, make sure system latency is within accepted boundaries

1 0

r304 - trunk/v7
by gnichols＠fedoraproject.org 12 Jan '10

12 Jan '10

Author: gnichols Date: 2010-01-13 00:55:20 +0000 (Wed, 13 Jan 2010) New Revision: 304 Modified: trunk/v7/hardwaretest.py Log: 488145 - FEAT: HTS should provide a run-time dependency option for installation \n- adds --mode auto support Modified: trunk/v7/hardwaretest.py =================================================================== --- trunk/v7/hardwaretest.py 2010-01-13 00:51:00 UTC (rev 303) +++ trunk/v7/hardwaretest.py 2010-01-13 00:55:20 UTC (rev 304) @@ -386,7 +386,7 @@ for rpm in missingRPMs: missingRPMList = "%s %s" % (missingRPMList, rpm) print missingRPMList - if self.ui.promptConfirm("Would you like to install them now?"): + if self.options.mode == Constants.auto or self.ui.promptConfirm("Would you like to install them now?"): try: yum = Command("yum install -y " + missingRPMList) print "Running yum: --------------------------------"

1 0

r303 - trunk
by gnichols＠fedoraproject.org 12 Jan '10

12 Jan '10

Author: gnichols Date: 2010-01-13 00:51:00 +0000 (Wed, 13 Jan 2010) New Revision: 303 Modified: trunk/Makefile Log: R23 Modified: trunk/Makefile =================================================================== --- trunk/Makefile 2010-01-12 17:05:34 UTC (rev 302) +++ trunk/Makefile 2010-01-13 00:51:00 UTC (rev 303) @@ -14,7 +14,7 @@ # Author: Greg Nichols V7_VERSION := 1.0 -V7_RELEASE := 22 +V7_RELEASE := 23 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

r302 - trunk/tests/rteval
by David Sommerseth 12 Jan '10

12 Jan '10

Author: dsommers Date: 2010-01-12 17:05:34 +0000 (Tue, 12 Jan 2010) New Revision: 302 Modified: trunk/tests/rteval/v7_rteval.py Log: Make runtime for rteval 4h, and use more sensible PASS values Modified: trunk/tests/rteval/v7_rteval.py =================================================================== --- trunk/tests/rteval/v7_rteval.py 2010-01-12 17:05:27 UTC (rev 301) +++ trunk/tests/rteval/v7_rteval.py 2010-01-12 17:05:34 UTC (rev 302) @@ -57,7 +57,7 @@ # Prepare rteval import rteval.rteval - args = ['-d', '30s'] + args = ['-d', '4h'] self.rteval = rteval.rteval.RtEval(args) ret = list() @@ -77,8 +77,7 @@ xpath = report.xpathNewContext() ok_values = {"/rteval/cyclictest/system/statistics/maximum": 100.0, - "/rteval/cyclictest/system/statistics/standard_deviation": 10.0, - "/rteval/cyclictest/system/statistics/variance": 5.0 } + "/rteval/cyclictest/system/statistics/standard_deviation": 3.0} for k in ok_values.keys(): val = xpath.xpathEval(k)

1 0

r301 - trunk
by David Sommerseth 12 Jan '10

12 Jan '10

Author: dsommers Date: 2010-01-12 17:05:27 +0000 (Tue, 12 Jan 2010) New Revision: 301 Modified: trunk/Makefile Log: Fixed a few minor things in Makefile to make the rpm rule work again Modified: trunk/Makefile =================================================================== --- trunk/Makefile 2010-01-12 17:05:18 UTC (rev 300) +++ trunk/Makefile 2010-01-12 17:05:27 UTC (rev 301) @@ -81,10 +81,10 @@ v7.spec: v7.spec.in Makefile cat $< | sed -e 's/@V7_VERSION@/$(V7_VERSION)/g' -e 's/@V7_RELEASE@/$(V7_RELEASE)/g' -e 's/@V7_RHEL_VERSION@/$(V7_RHEL_VERSION)/g'> $@ -rpm-prep: v7-$(V7_VERSION_RELEASE).tar.bz2 v7.spec +rpm-prep: v7-$(V7_VERSION_RELEASE).el$(V7_RHEL_VERSION).tar.bz2 v7.spec rm -rf rpm mkdir -p rpm/{BUILD,RPMS,SRPMS,SOURCES,SPECS} - cp v7-$(V7_VERSION_RELEASE).tar.bz2 rpm/SOURCES/ + cp v7-$(V7_VERSION_RELEASE).el$(V7_RHEL_VERSION).tar.bz2 rpm/SOURCES/ cp v7.spec rpm/SPECS srpm: rpm-prep

1 0

r300 - trunk/tests/rteval
by David Sommerseth 12 Jan '10

12 Jan '10

Author: dsommers Date: 2010-01-12 17:05:18 +0000 (Tue, 12 Jan 2010) New Revision: 300 Modified: trunk/tests/rteval/v7_rteval.py Log: Improved rteval result checking, by validating some of the measurement data Modified: trunk/tests/rteval/v7_rteval.py =================================================================== --- trunk/tests/rteval/v7_rteval.py 2010-01-12 17:05:10 UTC (rev 299) +++ trunk/tests/rteval/v7_rteval.py 2010-01-12 17:05:18 UTC (rev 300) @@ -69,11 +69,29 @@ FAILED = 1 PASSED = 0 - if self.rteval.rteval() == 0: - return PASSED - return FAILED + if self.rteval.rteval() != 0: + return FAILED + # Analyse the result, make sure system latency is within accepted boundaries + report = self.rteval.XMLreport() + xpath = report.xpathNewContext() + ok_values = {"/rteval/cyclictest/system/statistics/maximum": 100.0, + "/rteval/cyclictest/system/statistics/standard_deviation": 10.0, + "/rteval/cyclictest/system/statistics/variance": 5.0 } + + for k in ok_values.keys(): + val = xpath.xpathEval(k) + if len(val) == 1: + v = float(val[0].get_content()) + print "Checking %s: Must be < %f, measured to %f ..." % (k, ok_values[k], v), + if ok_values[k] < v: + print "** FAILED **" + return FAILED + print "PASS" + return PASSED + + if __name__ == "__main__": test = v7RTeval() test.plan(None)

1 0

r299 - trunk/tests/rteval
by David Sommerseth 12 Jan '10

12 Jan '10

Author: dsommers Date: 2010-01-12 17:05:10 +0000 (Tue, 12 Jan 2010) New Revision: 299 Added: trunk/tests/rteval/runtest.sh Modified: trunk/tests/rteval/Makefile trunk/tests/rteval/v7_rteval.py Log: Final fixes to make v7 run the v7_rteval.py without failures Modified: trunk/tests/rteval/Makefile =================================================================== --- trunk/tests/rteval/Makefile 2010-01-12 17:05:00 UTC (rev 298) +++ trunk/tests/rteval/Makefile 2010-01-12 17:05:10 UTC (rev 299) @@ -15,7 +15,7 @@ .PHONY: all install download clean -FILES=$(METADATA) runtest.sh lid.py +FILES=$(METADATA) runtest.sh v7_rteval.py run: $(FILES) build ./runtest.sh Added: trunk/tests/rteval/runtest.sh =================================================================== --- trunk/tests/rteval/runtest.sh (rev 0) +++ trunk/tests/rteval/runtest.sh 2010-01-12 17:05:10 UTC (rev 299) @@ -0,0 +1,3 @@ +#!/bin/bash + +v7-run-simple-test ${TEST:-$(basename $PWD)} ./v7_rteval.py Property changes on: trunk/tests/rteval/runtest.sh ___________________________________________________________________ Name: svn:executable + * Modified: trunk/tests/rteval/v7_rteval.py =================================================================== --- trunk/tests/rteval/v7_rteval.py 2010-01-12 17:05:00 UTC (rev 298) +++ trunk/tests/rteval/v7_rteval.py 2010-01-12 17:05:10 UTC (rev 299) @@ -22,6 +22,7 @@ from v7.test import Test from v7.tags import Constants +from v7.tags import DeviceClass class v7RTeval(Test): @@ -30,8 +31,8 @@ self.interactive = False self.data = {} self.rteval = None + self.deviceClass = DeviceClass.processor - def __read_sys_dmi(self, name): try: f = open("/sys/class/dmi/id/%s" % name, "r") @@ -61,7 +62,6 @@ ret = list() ret.append(self.makeCopy()) - self.setDevice('rt-hw') return ret

1 0

r298 - trunk/tests/rteval
by David Sommerseth 12 Jan '10

12 Jan '10

Author: dsommers Date: 2010-01-12 17:05:00 +0000 (Tue, 12 Jan 2010) New Revision: 298 Added: trunk/tests/rteval/Makefile Log: Added needed Makefile for v7 packaging Added: trunk/tests/rteval/Makefile =================================================================== --- trunk/tests/rteval/Makefile (rev 0) +++ trunk/tests/rteval/Makefile 2010-01-12 17:05:00 UTC (rev 298) @@ -0,0 +1,46 @@ +# V7 +TOPLEVEL_NAMESPACE=/V7 + +# The name of the package under test: +PACKAGE_NAME=v7 + +# The path of the test below the package: +RELATIVE_PATH=rteval + +# Version of the Test. Used with make tag. +export TESTVERSION=1.1 + +# The compiled namespace of the test. +export TEST=$(TOPLEVEL_NAMESPACE)/$(PACKAGE_NAME)/$(RELATIVE_PATH) + +.PHONY: all install download clean + +FILES=$(METADATA) runtest.sh lid.py + +run: $(FILES) build + ./runtest.sh + +build: $(BUILT_FILES) + chmod a+x ./runtest.sh ./v7_rteval.py + +clean: + rm -f *~ $(BUILT_FILES) + +# Include Common Makefile +include $(DESTDIR)/usr/share/v7/lib/v7-make.include + +# Generate the testinfo.desc here: +$(METADATA): Makefile + @touch $(METADATA) + @echo "Owner: David Sommerseth <davids(a)redhat.com>" > $(METADATA) + @echo "Name: $(TEST)" >> $(METADATA) + @echo "Path: $(TEST_DIR)" >> $(METADATA) + @echo "TestVersion: $(TESTVERSION)" >> $(METADATA) + @echo "Description: Hardware Certification Real-Time kernel validation Test">> $(METADATA) + @echo "TestTime: 10h" >> $(METADATA) + @echo "RunFor: $(PACKAGE_NAME)" >> $(METADATA) + @echo "Requires: $(PACKAGE_NAME)" >> $(METADATA) +# @echo "X-RunForDevice: 'lid' in button.type" >> $(METADATA) + @echo "X-Interactive: no" >> $(METADATA) + +

1 0

r297 - in trunk/tests: . rteval
by David Sommerseth 12 Jan '10

12 Jan '10

Author: dsommers Date: 2010-01-12 17:04:53 +0000 (Tue, 12 Jan 2010) New Revision: 297 Modified: trunk/tests/Makefile trunk/tests/rteval/v7_rteval.py Log: More fixes to make the v7_rteval test work Modified: trunk/tests/Makefile =================================================================== --- trunk/tests/Makefile 2010-01-12 17:04:41 UTC (rev 296) +++ trunk/tests/Makefile 2010-01-12 17:04:53 UTC (rev 297) @@ -15,11 +15,11 @@ .PHONY: clean install -SUBDIRS := audio bluray cdrom dvd core floppy info memory network pccard storage tape usb video battery suspend lid expresscard cpuscaling profiler fv_core fv_memory fv_network fv_storage +SUBDIRS := audio bluray cdrom dvd core floppy info memory network pccard storage tape usb video battery suspend lid expresscard cpuscaling profiler fv_core fv_memory fv_network fv_storage rteval clean: for i in $(SUBDIRS); do $(MAKE) -C $$i clean; done - + install: mkdir -p $(DESTDIR)/usr/share/v7/tests for i in $(SUBDIRS); do cp -r $$i $(DESTDIR)/usr/share/v7/tests; done Modified: trunk/tests/rteval/v7_rteval.py =================================================================== --- trunk/tests/rteval/v7_rteval.py 2010-01-12 17:04:41 UTC (rev 296) +++ trunk/tests/rteval/v7_rteval.py 2010-01-12 17:04:53 UTC (rev 297) @@ -58,9 +58,13 @@ args = ['-d', '30s'] self.rteval = rteval.rteval.RtEval(args) - return (self.makeCopy()) + ret = list() + ret.append(self.makeCopy()) + self.setDevice('rt-hw') + return ret + def run(self): FAILED = 1 PASSED = 0

1 0

r296 - in trunk/tests: . rteval
by David Sommerseth 12 Jan '10

12 Jan '10

Author: dsommers Date: 2010-01-12 17:04:41 +0000 (Tue, 12 Jan 2010) New Revision: 296 Added: trunk/tests/rteval/ trunk/tests/rteval/v7_rteval.py Log: Added first cut of a v7 rteval test Added: trunk/tests/rteval/v7_rteval.py =================================================================== --- trunk/tests/rteval/v7_rteval.py (rev 0) +++ trunk/tests/rteval/v7_rteval.py 2010-01-12 17:04:41 UTC (rev 296) @@ -0,0 +1,78 @@ +#!/usr/bin/python +# Copyright (c) 2009 Red Hat, Inc. All rights reserved. This copyrighted material +# is made available to anyone wishing to use, modify, copy, or +# redistribute it subject to the terms and conditions of the GNU General +# Public License v.2. +# +# This program is distributed in the hope that it will be useful, but WITHOUT ANY +# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. See the GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# +# Author: David Sommerseth <davids(a)redhat.com> +# + +import os, sys, string, time + +if __name__ == "__main__": + sys.path.insert(0, '/usr/share/v7/lib') + +from v7.test import Test +from v7.tags import Constants + +class v7RTeval(Test): + + def __init__(self): + Test.__init__(self, name="rteval") + self.interactive = False + self.data = {} + self.rteval = None + + + def __read_sys_dmi(self, name): + try: + f = open("/sys/class/dmi/id/%s" % name, "r") + ret = f.readline().strip() + f.close() + return ret + except IOError: + print "Could not open /sys/class/dmi/id/%s ... are you running the right kernel?" % name + return None + + + def plan(self, devices): + # Check if we have some interesting data from the /sys/class/dmi/id directory + self.data['sysdmi'] = {} + files = ('sys_vendor','product_name','product_version') + for f in files: + self.data['sysdmi'][f] = self.__read_sys_dmi(f) + if self.data['sysdmi'][f] is None: + # If one of the /sys/class/dmi/id files is missing, abort this test planning + return () + + # Prepare rteval + import rteval.rteval + + args = ['-d', '30s'] + self.rteval = rteval.rteval.RtEval(args) + return (self.makeCopy()) + + + def run(self): + FAILED = 1 + PASSED = 0 + + if self.rteval.rteval() == 0: + return PASSED + return FAILED + + +if __name__ == "__main__": + test = v7RTeval() + test.plan(None) + returnValue = test.do(sys.argv) + sys.exit(returnValue) + Property changes on: trunk/tests/rteval/v7_rteval.py ___________________________________________________________________ Name: svn:executable + *

1 0

r295 - trunk
by David Sommerseth 12 Jan '10

12 Jan '10

Author: dsommers Date: 2010-01-12 17:04:34 +0000 (Tue, 12 Jan 2010) New Revision: 295 Modified: trunk/Makefile Log: Reworked rpm and srpm Makefile targets - do all work inside $(cwd)/rpm/ Modified: trunk/Makefile =================================================================== --- trunk/Makefile 2010-01-12 17:04:26 UTC (rev 294) +++ trunk/Makefile 2010-01-12 17:04:34 UTC (rev 295) @@ -24,6 +24,8 @@ HERE=$(shell pwd) +HERE=$(shell pwd) + .PHONY: clean install SUBDIRS := test-env v7 tests docs @@ -48,6 +50,7 @@ mkdir -p $(DESTDIR)/var/v7 mkdir -p $(DESTDIR)/var/v7/docs for i in $(SUBDIRS); do $(MAKE) -C $$i DESTDIR=$(DESTDIR) V7_VERSION=$(V7_VERSION) V7_RELEASE=$(V7_RELEASE) V7_RHEL_VERSION=$(V7_RHEL_VERSION) install; done + for i in $(SUBDIRS); do $(MAKE) -C $$i DESTDIR=$(DESTDIR) V7_VERSION=$(V7_VERSION) V7_RELEASE=$(V7_RELEASE) install; done clean: $(MAKE) -C tests clean

1 0

r294 - trunk
by David Sommerseth 12 Jan '10

12 Jan '10

Author: dsommers Date: 2010-01-12 17:04:26 +0000 (Tue, 12 Jan 2010) New Revision: 294 Modified: trunk/Makefile Log: Reworked rpm and srpm Makefile targets - do all work inside $(cwd)/rpm/ Modified: trunk/Makefile =================================================================== --- trunk/Makefile 2010-01-12 17:04:19 UTC (rev 293) +++ trunk/Makefile 2010-01-12 17:04:26 UTC (rev 294) @@ -22,6 +22,8 @@ HERE=$(shell pwd) +HERE=$(shell pwd) + .PHONY: clean install SUBDIRS := test-env v7 tests docs

1 0

r293 - trunk
by David Sommerseth 12 Jan '10

12 Jan '10

Author: dsommers Date: 2010-01-12 17:04:19 +0000 (Tue, 12 Jan 2010) New Revision: 293 Modified: trunk/Makefile Log: Reworked rpm and srpm Makefile targets - do all work inside $(cwd)/rpm/ Modified: trunk/Makefile =================================================================== --- trunk/Makefile 2010-01-12 16:50:58 UTC (rev 292) +++ trunk/Makefile 2010-01-12 17:04:19 UTC (rev 293) @@ -20,6 +20,8 @@ V7_SVN_MODULE := svn+ssh://svn.fedorahosted.org/svn/v7 V7_RHEL_VERSION := 5 +HERE=$(shell pwd) + .PHONY: clean install SUBDIRS := test-env v7 tests docs @@ -31,7 +33,7 @@ tag: mark-version svn copy . $(V7_SVN_MODULE)/tags/`echo "v7-V$(V7_VERSION)R$(V7_RELEASE)" | sed "/\./s//-/"` -m "tag version" - + mark-version: @echo " " > $(V7_VERSION_PY) @echo "# $(V7_VERSION_PY) is automatically-generated - DO NOT EDIT" >> $(V7_VERSION_PY) @@ -44,7 +46,7 @@ mkdir -p $(DESTDIR)/var/v7 mkdir -p $(DESTDIR)/var/v7/docs for i in $(SUBDIRS); do $(MAKE) -C $$i DESTDIR=$(DESTDIR) V7_VERSION=$(V7_VERSION) V7_RELEASE=$(V7_RELEASE) V7_RHEL_VERSION=$(V7_RHEL_VERSION) install; done - + clean: $(MAKE) -C tests clean $(MAKE) -C v7 clean @@ -59,8 +61,8 @@ v7-$(V7_VERSION_RELEASE).el$(V7_RHEL_VERSION).tar.bz2: /tmp/v7/exclude v7.spec tar cjS -f $@ -X /tmp/v7/exclude --exclude $@ * - + /tmp/v7/exclude: mkdir -p /tmp/v7 echo "CVS" > $@ @@ -74,11 +76,15 @@ v7.spec: v7.spec.in Makefile cat $< | sed -e 's/@V7_VERSION@/$(V7_VERSION)/g' -e 's/@V7_RELEASE@/$(V7_RELEASE)/g' -e 's/@V7_RHEL_VERSION@/$(V7_RHEL_VERSION)/g'> $@ +rpm-prep: v7-$(V7_VERSION_RELEASE).tar.bz2 v7.spec + rm -rf rpm + mkdir -p rpm/{BUILD,RPMS,SRPMS,SOURCES,SPECS} + cp v7-$(V7_VERSION_RELEASE).tar.bz2 rpm/SOURCES/ + cp v7.spec rpm/SPECS -srpm: package - rpmbuild -ts v7-$(V7_VERSION_RELEASE).el$(V7_RHEL_VERSION).tar.bz2 +srpm: rpm-prep + rpmbuild --define "_topdir $(HERE)/rpm" -bs rpm/SPECS/v7.spec -rpm: package - rpmbuild -tb v7-$(V7_VERSION_RELEASE).el$(V7_RHEL_VERSION).tar.bz2 +rpm: rpm-prep + rpmbuild --define "_topdir $(HERE)/rpm" -ba rpm/SPECS/v7.spec -

1 0

r292 - in tags: . v7-V1-0R22/v7
by gnichols＠fedoraproject.org 12 Jan '10

12 Jan '10

Author: gnichols Date: 2010-01-12 16:50:58 +0000 (Tue, 12 Jan 2010) New Revision: 292 Added: tags/v7-V1-0R22/ Modified: tags/v7-V1-0R22/v7/version.py Log: tag version Copied: tags/v7-V1-0R22 (from rev 291, trunk) Modified: tags/v7-V1-0R22/v7/version.py =================================================================== --- trunk/v7/version.py 2010-01-12 16:45:24 UTC (rev 291) +++ tags/v7-V1-0R22/v7/version.py 2010-01-12 16:50:58 UTC (rev 292) @@ -1,4 +1,5 @@ # v7/version.py is automatically-generated - DO NOT EDIT version = '1.0' -release = '20' +release = '22' +rhel_version = '5'

1 0

r291 - trunk/tests/cpuscaling
by gnichols＠fedoraproject.org 12 Jan '10

12 Jan '10

Author: gnichols Date: 2010-01-12 16:45:24 +0000 (Tue, 12 Jan 2010) New Revision: 291 Modified: trunk/tests/cpuscaling/cpuscaling.py Log: 474856 - CPUScaling Fails in HTS 5.3-3. Modified: trunk/tests/cpuscaling/cpuscaling.py =================================================================== --- trunk/tests/cpuscaling/cpuscaling.py 2010-01-12 16:35:52 UTC (rev 290) +++ trunk/tests/cpuscaling/cpuscaling.py 2010-01-12 16:45:24 UTC (rev 291) @@ -357,7 +357,7 @@ # run to verify the base line execution time, bail if self.retryTolerance margin cannot be acheived in self.retryLimit runs. self.minimumFrequencyTestTime = self.runLoadTest() if not self.minimumFrequencyTestTime: - success = False + return False print "Minumum frequency load test time: %.2f" % self.minimumFrequencyTestTime # 11. Set the cpu speed to it's highest value as above. @@ -375,7 +375,7 @@ # 12. Repeat workload test, record timing self.maximumFrequencyTestTime = self.runLoadTest() if not self.maximumFrequencyTestTime: - success = False + return False print "Maximum frequency load test time: %.2f" % self.maximumFrequencyTestTime # 13. Verify MHz increase is comparable to time % decrease( eg. slow MHz/fast MHz ~= fast time/slow time; @@ -424,7 +424,7 @@ # 17. Repeat workload test, record timing; also during testing verify the ~scaling_cur_freq reaches ~scaling_max_freq self.onDemandTestTime = self.runLoadTest() if not self.onDemandTestTime: - success = False + return False print "On Demand load test time: %.2f" % self.onDemandTestTime # 18. Compare the timing to the max results from earlier, again time should be within self.speedUpTolerance @@ -462,7 +462,7 @@ currentFrequency = self.getParameter("scaling_cur_freq") if not maximumFrequency or not currentFrequency or (maximumFrequency != currentFrequency): print "Error: Current cpu frequency of %.2f is not set to the maximum value of %.2f" % (currentFrequency, maximumFrequency) - success = False + return False # 22. Repeat workload test, record timing, also verify frequency does not drop during run self.performanceTestTime = self.runLoadTest()

1 0

r290 - trunk/v7
by gnichols＠fedoraproject.org 12 Jan '10

12 Jan '10

Author: gnichols Date: 2010-01-12 16:35:52 +0000 (Tue, 12 Jan 2010) New Revision: 290 Modified: trunk/v7/test.py Log: fix getDeviceClass Modified: trunk/v7/test.py =================================================================== --- trunk/v7/test.py 2010-01-12 16:32:44 UTC (rev 289) +++ trunk/v7/test.py 2010-01-12 16:35:52 UTC (rev 290) @@ -130,10 +130,7 @@ if self.serverMode: return Constants.yes return Constants.no def getDeviceClass(self): - if self.deviceClass: - return self.deviceClass - else: - return self.name() + return self.deviceClass def getDeviceBus(self): if self.device: return self.device.getPropertyString("bus")

1 0

r289 - trunk/v7
by gnichols＠fedoraproject.org 12 Jan '10

12 Jan '10

Author: gnichols Date: 2010-01-12 16:32:44 +0000 (Tue, 12 Jan 2010) New Revision: 289 Added: trunk/v7/hash.py Modified: trunk/v7/report.py Log: 484657 - hts uses code deprecated in python 2.6 Added: trunk/v7/hash.py =================================================================== --- trunk/v7/hash.py (rev 0) +++ trunk/v7/hash.py 2010-01-12 16:32:44 UTC (rev 289) @@ -0,0 +1,45 @@ +# Copyright (c) 2006 Red Hat, Inc. All rights reserved. This copyrighted material +# is made available to anyone wishing to use, modify, copy, or +# redistribute it subject to the terms and conditions of the GNU General +# Public License v.2. +# +# This program is distributed in the hope that it will be useful, but WITHOUT ANY +# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. See the GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# +# Author: Greg Nichols +# +# The Report object packages and/or presents test results in text, rpm, or html form. +# + +hashModule = None +try: + import hashlib + hashModule = hashlib +except: + pass + +if not hashModule: + try: + import md5 + hashModule = md5 + except: + print "Error: could not find hash library" + +if __name__ == "__main__": + print hashModule + content = "Boo" + m=hashModule.md5() + m.update(content) + print content + + + + + + + Modified: trunk/v7/report.py =================================================================== --- trunk/v7/report.py 2010-01-12 16:16:23 UTC (rev 288) +++ trunk/v7/report.py 2010-01-12 16:32:44 UTC (rev 289) @@ -16,12 +16,13 @@ # The Report object packages and/or presents test results in text, rpm, or html form. # -import os,sys,shutil, hashlib, codecs +import os,sys,shutil, codecs import string from v7.tags import Constants, Tags from v7.controller import Controller from v7.command import Command, V7CommandException +from v7.hash import hashModule class Report(Controller): @@ -410,7 +411,7 @@ returnValue = 0 for line in log: contents += line - m=hashlib.md5() + m=hashModule.md5() m.update(contents) sum=int(m.hexdigest(),16) # YK: write the decimal format result to output.log, not hex

1 0

r288 - trunk/tools
by gnichols＠fedoraproject.org 12 Jan '10

12 Jan '10

Author: gnichols Date: 2010-01-12 16:16:23 +0000 (Tue, 12 Jan 2010) New Revision: 288 Modified: trunk/tools/v7-release.py Log: fix Modified: trunk/tools/v7-release.py =================================================================== --- trunk/tools/v7-release.py 2010-01-12 16:14:46 UTC (rev 287) +++ trunk/tools/v7-release.py 2010-01-12 16:16:23 UTC (rev 288) @@ -26,12 +26,15 @@ sourceTar = "%s/v7-%s-%s.el%s.tar.bz2" % (buildDir, v7.version.version, v7.version.release, v7.version.rhel_version) -print "building for RHEL %u" % v7.version.rhel_version +print "building for RHEL %s" % v7.version.rhel_version -distSubdir = "RHEL-%u-HWCert" % v7.version.rhel_version +distSubdir = "RHEL-%s-HWCert" % v7.version.rhel_version distVersionDir = "%s/%s" % (distDir, distSubdir) os.chdir(distVersionDir) +#copy the spec file +shutil.copy(os.path.join(buildDir, "v7.spec"), "v7.spec") + # upload the tarball command = "make upload FILES=%s" % sourceTar print command @@ -46,7 +49,12 @@ os.system(command) # build it -command = "make build COLLECTION=hwcert-%uE" % v7.version.rhel_version +if v7.version.rhel_version == "6": + tag = "HWCert-RHEL-6" +else: + tag = "hwcert-%sE" % v7.version.rhel_version + +command = "make build COLLECTION=%s" % tag print command os.system(command)

1 0

r287 - trunk/v7
by gnichols＠fedoraproject.org 12 Jan '10

12 Jan '10

Author: gnichols Date: 2010-01-12 16:14:46 +0000 (Tue, 12 Jan 2010) New Revision: 287 Modified: trunk/v7/command.py Log: 488145 - FEAT: HTS should provide a run-time dependency option for installation Modified: trunk/v7/command.py =================================================================== --- trunk/v7/command.py 2010-01-12 16:14:15 UTC (rev 286) +++ trunk/v7/command.py 2010-01-12 16:14:46 UTC (rev 287) @@ -48,21 +48,12 @@ (output, errors) = self.pipe.communicate() if output: self.output = output.splitlines() - # make the last line has the new line at the end - if self.output[-1][-1:] != '\n': - self.output[-1] = self.output[-1] + '\n' if errors: self.errors = errors.splitlines() - # make the last line has the new line at the end - if self.errors[-1][-1:] != '\n': - self.errors[-1] = self.output[-1] + '\n' self.returnValue = (self.pipe.returncode >> 8) & 0xFF self.signal = self.pipe.returncode & 0xFF - if self.errors: - for line in self.errors: - sys.stderr.write( line ) - sys.stderr.flush() + self.printErrors() def _checkErrors(self): @@ -101,12 +92,14 @@ if self.output: for line in self.output: sys.stdout.write( line ) + sys.stdout.write("\n") sys.stdout.flush() def printErrors(self): if self.errors: for line in self.errors: sys.stderr.write( line ) + sys.stderr.write("\n") sys.stderr.flush()

1 0

r286 - trunk/v7
by gnichols＠fedoraproject.org 12 Jan '10

12 Jan '10

Author: gnichols Date: 2010-01-12 16:14:15 +0000 (Tue, 12 Jan 2010) New Revision: 286 Modified: trunk/v7/test.py Log: 488145 - FEAT: HTS should provide a run-time dependency option for installation Modified: trunk/v7/test.py =================================================================== --- trunk/v7/test.py 2010-01-12 16:13:59 UTC (rev 285) +++ trunk/v7/test.py 2010-01-12 16:14:15 UTC (rev 286) @@ -399,4 +399,7 @@ return self.virtualization - + def getRequiredRPMs(self): + """Test should implement this method if they have package + requirements dependant on hardware or RHEL release""" + return list()

1 0

r285 - trunk/v7
by gnichols＠fedoraproject.org 12 Jan '10

12 Jan '10

Author: gnichols Date: 2010-01-12 16:13:59 +0000 (Tue, 12 Jan 2010) New Revision: 285 Modified: trunk/v7/hardwaretest.py Log: 488145 - FEAT: HTS should provide a run-time dependency option for installation Modified: trunk/v7/hardwaretest.py =================================================================== --- trunk/v7/hardwaretest.py 2010-01-12 16:03:31 UTC (rev 284) +++ trunk/v7/hardwaretest.py 2010-01-12 16:13:59 UTC (rev 285) @@ -220,13 +220,18 @@ print "Hardware: %s %s %s" % (self.certification.getHardware(Tags.vendor), self.certification.getHardware(Tags.make), self.certification.getHardware(Tags.model)) - self.certification.setOS(Tags.name, self.getReleaseName()) - releaseNumber = self.getReleaseNumber() - if releaseNumber: - self.certification.setOS(Tags.release, releaseNumber) + (product, name, number) = self.getRedHatRelease() + self.certification.setOS(Tags.name, name) + if number: + self.certification.setOS(Tags.release, number) else: print "Error: could not determine OS release number" - return False + return False + if product: + self.certification.setOS(Tags.product, product) + else: + print "Error: could not determine OS product name" + return False print "OS: %s %s" % (self.certification.getOS(Tags.name), self.certification.getOS(Tags.release)) hostname = socket.gethostname() if hostname: @@ -272,6 +277,7 @@ if not self.certification: self.doDiscover() self.saveNewPlan(tests) + self.checkRequiredRPMs(tests) else: if not self.checkPlan(): return False @@ -347,6 +353,56 @@ missingTests[key].markDeleted() return True + + def checkRequiredRPMs(self, tests): + print "Checking for additional required packages based on the test plan:" + requiredRPMs = dict() + for test in tests: + rpms = test.getRequiredRPMs() + if len(rpms) > 0: + sys.stdout.write(test.Name() + " requires ") + needComma = False + for rpm in rpms: + if needComma: + sys.stdout.write(", ") + needComma = True + sys.stdout.write(rpm) + requiredRPMs[rpm] = rpm + sys.stdout.write("\n") + + while True: + missingRPMs = list() + for rpm in requiredRPMs.keys(): + try: + rpmQ = Command("rpm -q " + rpm) + rpmQ.getString("not installed") # this should throw and exception if rpm is there + missingRPMs.append(rpm) + except V7CommandException, e: + # "not installed" not there, so we're ok + pass + if len(missingRPMs) > 0: + print "The following rpms are required for testing:" + missingRPMList = "" + for rpm in missingRPMs: + missingRPMList = "%s %s" % (missingRPMList, rpm) + print missingRPMList + if self.ui.promptConfirm("Would you like to install them now?"): + try: + yum = Command("yum install -y " + missingRPMList) + print "Running yum: --------------------------------" + yum.echo() + print "---------------------------------------------" + except V7CommandException, e: + print "Error: Could not install rpm" + print e + print "Rechecking required rpms" + else: + print "Warning: some tests may fail due to missing rpms" + return False + else: + print "All required rpms installed" + return True + print "" def doServer(self, args): if len(args) > 1: @@ -794,24 +850,14 @@ f=open("/etc/redhat-release") line=f.readline() f.close() - return line - - def getReleaseNumber(self): - """Return the RHEL release number""" - line=self.getRedHatRelease() - # the number is the next string after "release" - lastword="" - for word in line.split(): - if lastword == "release": - return word - lastword=word - # otherwise, not found - return None - - def getReleaseName(self): - """Return the name of the RHEL release running on the system""" - line=self.getRedHatRelease() - return line[line.rindex('(')+1:line.rindex(')')] + if line: + pattern = re.compile("^(?P<product>[a-zA-Z\ ]+)release (?P<number>[1-9\.]+) $(?P<name>[a-zA-Z]+)$") + match = pattern.match(line) + product = None + if match.group("product"): + product = match.group("product").strip() + return (product, match.group("number"), match.group("name")) + return (None, None, None) def makeTestRunDirectory(self): """Create a directory for the current test run"""

1 0

r284 - trunk/v7
by gnichols＠fedoraproject.org 12 Jan '10

12 Jan '10

Author: gnichols Date: 2010-01-12 16:03:31 +0000 (Tue, 12 Jan 2010) New Revision: 284 Modified: trunk/v7/environment.py Log: 523824 - FEAT: v7 should fv_* tests should support KVM Modified: trunk/v7/environment.py =================================================================== --- trunk/v7/environment.py 2010-01-12 16:03:10 UTC (rev 283) +++ trunk/v7/environment.py 2010-01-12 16:03:31 UTC (rev 284) @@ -35,7 +35,9 @@ self.defaultLibraryDirectory = "/usr/share/v7/lib" self.defaultLogDirectory = "/var/log/v7" self.defaultGuestImageDirectory = '/var/lib/xen/images' + self.defaultKVMGuestImageDirectory = self.defaultDataDirectory self.defaultGuestConfigDirectory = '/etc/xen' + self.defaultKVMGuestConfigDirectory = '/etc/libvirt/qemu' self.defaultGuestBootDirectory = '/usr/lib/xen/boot/' self.defaultPartnerServerURL = "ftp://partners.redhat.com/a166eabc5cf5df158922f9b06e5e7b21/hwcert/" self.defaultMaximumAttachmentFileSize = 64 * 1048576 # 64 MB @@ -68,8 +70,12 @@ self.setTextNode(element, self.defaultLogDirectory) element = self.findOrCreateElement(filesystemElement, Tags.guest_image_directory) self.setTextNode(element, self.defaultGuestImageDirectory) + element = self.findOrCreateElement(filesystemElement, Tags.kvm_guest_image_directory) + self.setTextNode(element, self.defaultKVMGuestImageDirectory) element = self.findOrCreateElement(filesystemElement, Tags.guest_config_directory) self.setTextNode(element, self.defaultGuestConfigDirectory) + element = self.findOrCreateElement(filesystemElement, Tags.kvm_guest_config_directory) + self.setTextNode(element, self.defaultKVMGuestConfigDirectory) element = self.findOrCreateElement(filesystemElement, Tags.guest_boot_directory) self.setTextNode(element, self.defaultGuestBootDirectory) element = self.findOrCreateElement(urlElement, Tags.partner_server) @@ -113,9 +119,23 @@ guestImageElement = self.findOrCreateElement(self._getFilesystemElement(), Tags.guest_image_directory) return self.getTextNode(guestImageElement).data + def getKVMGuestImageDirectory(self): + guestImageElement = self.findOrCreateElement(self._getFilesystemElement(), Tags.kvm_guest_image_directory) + if not self.getTextNode(guestImageElement): + self.setTextNode(guestImageElement, self.defaultKVMGuestImageDirectory) + self.save(self.environmentFile) + return self.getTextNode(guestImageElement).data + def getGuestConfigDirectory(self): guestConfigElement = self.findOrCreateElement(self._getFilesystemElement(), Tags.guest_config_directory) return self.getTextNode(guestConfigElement).data + + def getKVMGuestConfigDirectory(self): + guestConfigElement = self.findOrCreateElement(self._getFilesystemElement(), Tags.kvm_guest_config_directory) + if not self.getTextNode(guestConfigElement): + self.setTextNode(guestConfigElement, self.defaultKVMGuestConfigDirectory) + self.save(self.environmentFile) + return self.getTextNode(guestConfigElement).data def getGuestBootDirectory(self): guestBootElement = self.findOrCreateElement(self._getFilesystemElement(), Tags.guest_boot_directory)

1 0

r283 - trunk/v7
by gnichols＠fedoraproject.org 12 Jan '10

12 Jan '10

Author: gnichols Date: 2010-01-12 16:03:10 +0000 (Tue, 12 Jan 2010) New Revision: 283 Modified: trunk/v7/tags.py Log: 523824 - FEAT: v7 should fv_* tests should support KVM Modified: trunk/v7/tags.py =================================================================== --- trunk/v7/tags.py 2010-01-12 16:02:53 UTC (rev 282) +++ trunk/v7/tags.py 2010-01-12 16:03:10 UTC (rev 283) @@ -50,10 +50,13 @@ device_class="device-class" attachment="attachment" guest_config_directory="guest-config-directory" + kvm_guest_config_directory="kvm-guest-config-directory" guest_image_directory="guest-image-directory" + kvm_guest_image_directory="kvm-guest-image-directory" guest_boot_directory="guest-boot-directory" urls="urls" partner_server="partner-server" + product="product" class Attributes: v7_version="v7-version" @@ -142,6 +145,9 @@ udev="udev" udi="udi" info_dot_udi="info.udi" + kvm="kvm" + xen="xen" + hvm="hvm" class SystemFunction: system = "system"

1 0

r282 - trunk/v7
by gnichols＠fedoraproject.org 12 Jan '10

12 Jan '10

Author: gnichols Date: 2010-01-12 16:02:53 +0000 (Tue, 12 Jan 2010) New Revision: 282 Modified: trunk/v7/fvtest.py Log: 523824 - FEAT: v7 should fv_* tests should support KVM Modified: trunk/v7/fvtest.py =================================================================== --- trunk/v7/fvtest.py 2010-01-09 20:31:08 UTC (rev 281) +++ trunk/v7/fvtest.py 2010-01-12 16:02:53 UTC (rev 282) @@ -45,7 +45,7 @@ self.hardwarePlatform = Command("uname -i").getString() self.guestName = "v7%s" % self.hardwarePlatform self.guestImageFile = 'v7' + self.hardwarePlatform + '.img' - self.guestConfigFile = 'v7' + self.hardwarePlatform + self.loopBackDevice = None self.dataImageFile = 'v7data.img' if self.hardwarePlatform == "ia64": self.nvramFile = "nvram_v7ia64" @@ -55,34 +55,72 @@ self.testToRun = "" self.waitTime = 60 # in minutes self.environment = Environment() + self.debug = Constants.off - # read the hypervisor capabilities if that file exists + self.__getHypervisor() + if self.hypervisor == Constants.xen: + self.guestConfigFile = 'v7' + self.hardwarePlatform + self.guestConfigPath = os.path.join(self.environment.getGuestConfigDirectory(), self.guestConfigFile) + self.guestImageDirectory = self.environment.getGuestImageDirectory() + elif self.hypervisor == Constants.kvm: + self.guestConfigFile = 'v7' + self.hardwarePlatform + ".xml" + self.guestConfigPath = os.path.join(self.environment.getKVMGuestConfigDirectory(), self.guestConfigFile) + self.guestImageDirectory = self.environment.getKVMGuestImageDirectory() + + def __getHypervisor(self): + cpuflags = Command("fgrep flags /proc/cpuinfo") + self.hypervisor = None try: - capabilityFile = open('/sys/hypervisor/properties/capabilities') - self.hypervisorCapabilities = capabilityFile.readline() - capabilityFile.close() - except IOError: - self.hypervisorCapabilities = 'none' + if cpuflags.getString(regex="(vmx|smx)", singleLine=False): + # read the hypervisor capabilities if that file exists + try: + capabilityFile = open('/sys/hypervisor/properties/capabilities') + self.hypervisorCapabilities = capabilityFile.readline() + capabilityFile.close() + if Constants.hvm in self.hypervisorCapabilities: + self.hypervisor = Constants.xen + except IOError: + self.hypervisorCapabilities = 'none' + + # if not xen, plan in for kvm + if self.hypervisor != Constants.xen: + self.hypervisor = Constants.kvm + except V7CommandException, e: + pass # no virtualization support def plan(self, devices): tests = list() - for device in devices: - # plan this test if the current system is capable to do FV - if 'xen' in device.getProperty("system.kernel.version") and 'hvm' in self.hypervisorCapabilities: - test = self.makeCopy() - test.setDevice(device) - tests.append(test) + if self.hypervisor == Constants.xen: + for device in devices: + if Constants.xen in device.getProperty("system.kernel.version"): + self.hypervisor = Constants.xen + test = self.makeCopy() + test.setDevice(device) + tests.append(test) + return tests + + # otherwise + if self.hypervisor == Constants.kvm: + test = self.makeCopy() + tests.append(test) + return tests + def getRequiredRPMs(self): + rpms = ["libvirt", "libvirt-python", "python-virtinst"] + if self.hypervisor == Constants.kvm: + rpms.append('qemu') + return rpms + def verifyGuest(self): guestName = None try: - guestName = Command("xm list").getString(regex=self.guestName, singleLine=False) + guestName = Command("virsh list").getString(regex=self.guestName, singleLine=False) print "Warning: Guest %s is already running" % guestName print "Attempting shutdown:" - Command("xm destroy %s" % self.guestName).echo() - guestName = Command("xm list").getString(regex=self.guestName, singleLine=False) + Command("virsh destroy %s" % self.guestName).echo() + guestName = Command("virsh list").getString(regex=self.guestName, singleLine=False) print "Error: could not shutdown guest" return False except: @@ -93,24 +131,21 @@ def verifyGuestFiles(self): - - #if not self.verifyFile(self.environment.getGuestConfigDirectory(), self.guestConfigFile): - filePath = os.path.join(self.environment.getGuestConfigDirectory(), self.guestConfigFile) - if os.path.exists(filePath): - print "Verified: " + filePath - elif not self.generateGuestConfigFile(): + if not self.verifyFile(self.guestImageDirectory, self.dataImageFile): return False - if not self.verifyFile(self.environment.getGuestImageDirectory(), self.dataImageFile): + if not self.verifyFile(self.guestImageDirectory, self.guestImageFile): return False - - if not self.verifyFile(self.environment.getGuestImageDirectory(), self.guestImageFile): - return False if self.hardwarePlatform == "ia64": if (not self.verifyFile(self.environment.getGuestBootDirectory(), self.nvramFile) or not self.verifyFile(self.environment.getGuestBootDirectory(), self.nvramUuidFile)): return False + + if os.path.exists(self.guestConfigPath): + print "Verified: " + self.guestConfigPath + elif not self.generateGuestConfigFile(): + return False print "Guest files verified" sys.stdout.flush() @@ -157,15 +192,47 @@ print "Error: could not find or download guest file" + filename return False - + def mountDataImage(self): + try: + self.loopBackDevice = Command("losetup -f").getString(regex="^(?P<device>/dev/loop[0-9]+)", regexGroup="device", singleLine=False) + print "Using loopback device " + self.loopBackDevice + " for guest data image" + loop = os.path.basename(self.loopBackDevice) + Command("losetup " + self.loopBackDevice + " " + os.path.join(self.guestImageDirectory, self.dataImageFile)).echo() + Command("kpartx -av " + self.loopBackDevice).echo() + partition = Command("ls /dev/mapper").getString(regex="%sp[0-9]" % loop, singleLine=False) + Command("mount /dev/mapper/" + partition + " /mnt").run() + print "Mounted /dev/mapper/" + partition + " on /mnt" + if self.debug != Constants.off: + Command("df -h /mnt").echo() + Command("ls -al /mnt").echo() + except V7CommandException, e: + print "Error: could not mount data image" + print e + return False + return True + + def unmountDataImage(self): + print "Unmounting /mnt" + sys.stdout.flush() + try: + Command("umount /mnt").echo() + if self.loopBackDevice: + print "Deleting loopback device " + self.loopBackDevice + " configuration." + Command("kpartx -dv " + self.loopBackDevice).echo() + Command("losetup -d " + self.loopBackDevice).echo() + except V7CommandException, e: + print e + print "Error: could not unmount data image." + return False + return True def submitTasks(self): # mount the data image and then write test info try: - dataImagePath = os.path.join(self.environment.getGuestImageDirectory(), self.dataImageFile) - Command("umount /mnt") - Command("lomount -diskimage %s -partition 1 /mnt" % dataImagePath).echo() - + dataImagePath = os.path.join(self.guestImageDirectory, self.dataImageFile) + self.unmountDataImage() + if not self.mountDataImage(): + return False guestScriptFile = "/mnt/v7-guest-script" guestScript = open(guestScriptFile, "w") guestScript.write("#!/bin/sh\n") @@ -187,7 +254,7 @@ guestScript.close() os.chmod(guestScriptFile, 0744) - Command("umount /mnt").echo() + self.unmountDataImage() print "Submitted tests: " + commandToRun sys.stdout.flush() return True @@ -196,7 +263,22 @@ print e return False + def generateGuestConfigFile(self): + guestImagePath = os.path.join(self.guestImageDirectory, self.guestImageFile) + guestDataPath = os.path.join(self.guestImageDirectory, self.dataImageFile) + if self.hypervisor == Constants.kvm: + virtInstall = "virt-install --name " + self.guestName + " --ram 512 --disk path=" + guestImagePath + " --disk path=" + guestDataPath + " --network network:default --vnc --import --noreboot --noautoconsole" + print virtInstall + try: + Command(virtInstall).echo() + except V7CommandException, e: + print "Error: could not generate guest config file." + print e + return False + return True + + # otherwise, use direct config generation for xen try: ifconfig = Command("ifconfig") xenbr = ifconfig.getString(regex="eth(?P<xenbrNumber>[0-9]+)", regexGroup="xenbrNumber", singleLine=False) @@ -215,7 +297,7 @@ # this uuid needs to match the one in the nvram files... guestConfig.write("uuid = \"8d6e4122-a025-0a68-2efd-c4ea32a5f235\"\n") else: - guestConfig.write("uuid = \"60d27529-59a2-99e6-8933-ca3609c58cdf\"\n") + guestConfig.write("uuid = \"60d27529-59a2-99e6-8933-ca3609c58cdf\"\n") guestConfig.write("maxmem = 512\n") guestConfig.write("memory = 512\n") guestConfig.write("vcpus = 1\n") @@ -254,16 +336,19 @@ return False + + def runGuest(self): + try: - Command("xm create v7%s" % self.hardwarePlatform).echo() + Command("virsh start %s" % self.guestName).echo() print "FV Guest started ..." except V7CommandException, e: print "Error: could not start the FV Guest." print e return False print "%s test is running, it takes some time(less than %s minutes), please be patient ..." % (self.name, self.waitTime) - print "You may use the virt-manager to open the virtual machine console to monitor the testing progress." + print "You may use \"virsh console %s\" to monitor the testing progress" % self.guestName sys.stdout.flush() # check the guest's status in every minute, this test should not consume more than 1 hour @@ -271,17 +356,18 @@ while 1: if count == self.waitTime: try: - Command("xm destroy v7%s" % self.hardwarePlatform).echo() - print "time out, the FV Guest was destroyed." + Command("virsh destroy %s" % self.guestName).echo() + print "time out, the FV Guest was destroyed." except V7CommandException, e: pass return False else: time.sleep(60) try: - guestIsRunning = Command("xm list").getString(regex="v7%s" % self.hardwarePlatform, singleLine=False) + guestIsRunning = Command("virsh list").getString(regex=self.guestName, singleLine=False) count = count + 1 except: + print "Guest has shutdown" break return True @@ -292,8 +378,7 @@ # mount the data image and see if the result rpm is there result = True try: - dataImagePath = os.path.join(self.environment.getGuestImageDirectory(), self.dataImageFile) - Command("lomount -diskimage %s -partition 1 /mnt" % dataImagePath).echo() + self.mountDataImage() Command("cp /mnt/" + self.environment.getResultsFileName() + " .").echo() # merge the results result = self.getGuestTestRunResult() @@ -303,7 +388,7 @@ result = False try: - Command("umount /mnt").echo() + self.unmountDataImage() except: print "Warning: could not unmount data image" print e

1 0

r281 - trunk
by gnichols＠fedoraproject.org 09 Jan '10

09 Jan '10

Author: gnichols Date: 2010-01-09 20:31:08 +0000 (Sat, 09 Jan 2010) New Revision: 281 Modified: trunk/Makefile Log: R22 Modified: trunk/Makefile =================================================================== --- trunk/Makefile 2009-12-22 18:18:19 UTC (rev 280) +++ trunk/Makefile 2010-01-09 20:31:08 UTC (rev 281) @@ -14,7 +14,7 @@ # Author: Greg Nichols V7_VERSION := 1.0 -V7_RELEASE := 21 +V7_RELEASE := 22 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

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

v7-commits January 2010