r1299 - tags
by gnichols＠fedoraproject.org
Author: gnichols
Date: 2012-04-25 18:19:20 +0000 (Wed, 25 Apr 2012)
New Revision: 1299
Added:
tags/v7-V1-5R22/
Log:
tag version
12 years
r1298 - trunk/v7
by gnichols＠fedoraproject.org
Author: gnichols
Date: 2012-04-25 18:18:50 +0000 (Wed, 25 Apr 2012)
New Revision: 1298
Modified:
trunk/v7/fvtest.py
Log:
816219 - fv storage and network tests may fail for multiple devices on guest
Modified: trunk/v7/fvtest.py
===================================================================
--- trunk/v7/fvtest.py 2012-04-25 18:18:20 UTC (rev 1297)
+++ trunk/v7/fvtest.py 2012-04-25 18:18:50 UTC (rev 1298)
@@ -516,22 +516,21 @@
# open the test results, and look for the run
results = ResultsDocument()
results.load(os.path.join(self.getOutputDirectory(), self.environment.getResultsFileName()))
- test = results.getTest(self.testToRun)
- if not test:
+ tests = results.getTests(self.testToRun)
+ if not tests:
print "Error: no test " + self.testToRun + " in guest results"
return False
testRun = None
- for run in test.getRuns():
- if run.getSummary() == Constants.PASS:
- print test.getName() + " Passed"
- return True
- else:
- print "Error: " + test.getName() + " run on guest Failed"
- return False
-
+ # if the test is run on multiple devices (storage, network), look for one that passed
+ for test in tests:
+ for run in test.getRuns():
+ if run.getSummary() == Constants.PASS:
+ print test.getName() + " Passed"
+ return True
# otherwise
- print "Error: could not find test run for " + self.testToRun
+ print "Error: " + test.getName() + " run on guest Failed"
return False
+
def run(self):
12 years
r1297 - trunk
by gnichols＠fedoraproject.org
Author: gnichols
Date: 2012-04-25 18:18:20 +0000 (Wed, 25 Apr 2012)
New Revision: 1297
Modified:
trunk/v7.spec.in
Log:
changelog
Modified: trunk/v7.spec.in
===================================================================
--- trunk/v7.spec.in 2012-04-25 18:16:32 UTC (rev 1296)
+++ trunk/v7.spec.in 2012-04-25 18:18:20 UTC (rev 1297)
@@ -80,6 +80,12 @@
%changelog
+* Wed Apr 25 2012 Greg Nichols <gnichols(a)redhat.com>
+
+V7 1.5 R22
+
+ 816219 - fv storage and network tests may fail for multiple devices on guest
+
* Fri Apr 20 2012 Greg Nichols <gnichols(a)redhat.com>
V7 1.5 R21
12 years
r1296 - trunk
by gnichols＠fedoraproject.org
Author: gnichols
Date: 2012-04-25 18:16:32 +0000 (Wed, 25 Apr 2012)
New Revision: 1296
Modified:
trunk/Makefile
Log:
R22
Modified: trunk/Makefile
===================================================================
--- trunk/Makefile 2012-04-24 22:37:47 UTC (rev 1295)
+++ trunk/Makefile 2012-04-25 18:16:32 UTC (rev 1296)
@@ -14,7 +14,7 @@
# Author: Greg Nichols
V7_VERSION := 1.5
-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
12 years
r1295 - trunk/tools/fv-guest
by gnichols＠fedoraproject.org
Author: gnichols
Date: 2012-04-24 22:37:47 +0000 (Tue, 24 Apr 2012)
New Revision: 1295
Modified:
trunk/tools/fv-guest/fv-domU-readme.txt
Log:
update
Modified: trunk/tools/fv-guest/fv-domU-readme.txt
===================================================================
--- trunk/tools/fv-guest/fv-domU-readme.txt 2012-04-24 20:50:44 UTC (rev 1294)
+++ trunk/tools/fv-guest/fv-domU-readme.txt 2012-04-24 22:37:47 UTC (rev 1295)
@@ -64,9 +64,13 @@
copy the rc.local from v7 source tree: v7/tools/fv-guest/fv-domU-rc.local to /etc/rc.local on the guest
+10 set the fstab to never auto fsck
+
+ edit /etc/fstab and change the 6th column to 0 for / and /boot so that the image never auto runs fsck
+
shutdown the guest (poweroff)
-10) tar and stamp the image:
+11) tar and stamp the image:
> cd /var/lib/xen/images
> tar jcvf v7i386-20120215.tar.bz2 v7i386.img
12 years
r1294 - trunk/tools/fv-guest
by gnichols＠fedoraproject.org
Author: gnichols
Date: 2012-04-24 20:50:44 +0000 (Tue, 24 Apr 2012)
New Revision: 1294
Modified:
trunk/tools/fv-guest/fv-domU-ks-i386.cfg
Log:
updates
Modified: trunk/tools/fv-guest/fv-domU-ks-i386.cfg
===================================================================
--- trunk/tools/fv-guest/fv-domU-ks-i386.cfg 2012-04-24 20:49:09 UTC (rev 1293)
+++ trunk/tools/fv-guest/fv-domU-ks-i386.cfg 2012-04-24 20:50:44 UTC (rev 1294)
@@ -13,8 +13,14 @@
selinux --enforcing
timezone --utc America/New_York
bootloader --location=mbr
-clearpart --initlabel --drives=hda
-autopart
+
+# Blank all disks and write disk labels, then install to disk /dev/sda ONLY.
+# NOTE: this may need to be set to sda rather than hda
+clearpart --all --initlabel
+part /boot --fstype ext3 --size=100 --ondisk=hda
+part swap --size=2000 --ondisk=hda
+part / --fstype ext3 --size=100 --grow --ondisk=hda
+
firstboot --disable
halt
12 years
r1293 - trunk/tools/fv-guest
by gnichols＠fedoraproject.org
Author: gnichols
Date: 2012-04-24 20:49:09 +0000 (Tue, 24 Apr 2012)
New Revision: 1293
Modified:
trunk/tools/fv-guest/fv-domU-ks-x86_64.cfg
trunk/tools/fv-guest/fv-domU-readme.txt
Log:
updates
Modified: trunk/tools/fv-guest/fv-domU-ks-x86_64.cfg
===================================================================
--- trunk/tools/fv-guest/fv-domU-ks-x86_64.cfg 2012-04-20 14:12:57 UTC (rev 1292)
+++ trunk/tools/fv-guest/fv-domU-ks-x86_64.cfg 2012-04-24 20:49:09 UTC (rev 1293)
@@ -13,8 +13,14 @@
selinux --enforcing
timezone --utc America/New_York
bootloader --location=mbr
-clearpart --initlabel --drives=hda
-autopart
+
+# Blank all disks and write disk labels, then install to disk /dev/sda ONLY.
+# NOTE: this may need to be set to sda rather than hda
+clearpart --all --initlabel
+part /boot --fstype ext3 --size=100 --ondisk=hda
+part swap --size=2000 --ondisk=hda
+part / --fstype ext3 --size=100 --grow --ondisk=hda
+
firstboot --disable
halt
Modified: trunk/tools/fv-guest/fv-domU-readme.txt
===================================================================
--- trunk/tools/fv-guest/fv-domU-readme.txt 2012-04-20 14:12:57 UTC (rev 1292)
+++ trunk/tools/fv-guest/fv-domU-readme.txt 2012-04-24 20:49:09 UTC (rev 1293)
@@ -2,6 +2,7 @@
Revised 2-10-12 for v7 1.5 to move images to RHEL 5.7
----------------------------------------------------------------------------
+0) rpms needed: mkisofs virt-install xen
1) get RHEL DVD iso from download.devel.redhat.com:
@@ -15,12 +16,15 @@
3) mount the boot iso, copy it
- > mount -0 loop -t iso9660 boot.iso boot
+ > mkdir boot
+ > mount -o loop -t iso9660 boot.iso boot
> cp -r boot boot-copy
4) add the kickstart file to the boot image
> cp v7/tools/fv-guest/fv-domU-ks-<arch>.cfg boot-copy/isolinux/ks.cfg
+ NOTE: the install disk may be either sda or hda
+
5) set isolinux.cfg to automatically install:
> vi boot-copy/isolinux/isolinux.cfg
@@ -40,10 +44,13 @@
6) build the revised boot.iso:
> cd boot-copy/isolinux
- > mkisofs -r -T -J -V "RedHatKSBoot" -b isolinux.bin -c boot.cat -no-emul-boot -boot-load-size 4 -boot-info-table -v -o /home/gnichols/fv-guest/boot.iso .
+ > mkisofs -r -T -J -V "RedHatKSBoot" -b isolinux.bin -c boot.cat -no-emul-boot -boot-load-size 4 -boot-info-table -v -o ~/new-boot.iso .
+ > mv ~/new-boot.iso /var/lib/xen/images/boot.iso
7) On a xen system, use virt-install to create the image:
+ service start xend
+ service start libvirtd
virt-install --hvm --name=v7i386 --ram=512 --vcpus=1 --network=bridge:xenbr0 --vnc --file=/var/lib/xen/images/v7i386.img --file-size=6 --cdrom /var/lib/xen/images/boot.iso
8) add the v7-dependant packages: dt/lmbench/stress
12 years
r1292 - tags
by gnichols＠fedoraproject.org
Author: gnichols
Date: 2012-04-20 14:12:57 +0000 (Fri, 20 Apr 2012)
New Revision: 1292
Added:
tags/v7-V1-5R21/
Log:
tag version
12 years
r1291 - trunk
by gnichols＠fedoraproject.org
Author: gnichols
Date: 2012-04-20 14:11:03 +0000 (Fri, 20 Apr 2012)
New Revision: 1291
Modified:
trunk/v7.spec.in
Log:
changelog
Modified: trunk/v7.spec.in
===================================================================
--- trunk/v7.spec.in 2012-04-20 13:27:43 UTC (rev 1290)
+++ trunk/v7.spec.in 2012-04-20 14:11:03 UTC (rev 1291)
@@ -80,6 +80,18 @@
%changelog
+* Fri Apr 20 2012 Greg Nichols <gnichols(a)redhat.com>
+
+V7 1.5 R21
+
+ 813405 - v7 should not prompt for certification id when hardware catalog is unreachable
+ 809026 - v7 trivial formatting fix
+ 811565 - v7 traceback on RHEL 7 Alpha1
+ 812437 - getModuleFile may return 'null'
+ 811247 - kabi-whitelists structure changing makes kabi check fail
+ 810497 - v7 info - make: *** No rule to make target `kernelInfo.xml'
+ 809240 - v7 plan --model should use the same prompts as v7 plan for certification data
+
* Tue Apr 17 2012 Greg Nichols <gnichols(a)redhat.com>
v7 1.5 R20
12 years
r1290 - trunk/v7
by gnichols＠fedoraproject.org
Author: gnichols
Date: 2012-04-20 13:27:43 +0000 (Fri, 20 Apr 2012)
New Revision: 1290
Modified:
trunk/v7/certificationtest.py
trunk/v7/hardwaretest.py
Log:
809240 - v7 plan --model should use the same prompts as v7 plan for certification data
Modified: trunk/v7/certificationtest.py
===================================================================
--- trunk/v7/certificationtest.py 2012-04-20 13:25:08 UTC (rev 1289)
+++ trunk/v7/certificationtest.py 2012-04-20 13:27:43 UTC (rev 1290)
@@ -57,18 +57,12 @@
hardwareElement = self.findOrCreateElement(self.document.documentElement, Tags.hardware)
element = self.findOrCreateElement(hardwareElement, tag)
textNode = self.getTextNode(element)
- # YK: return "unknown" if can not find such hardware info
- if textNode:
- if textNode.data:
- if textNode.data.isspace():
- return "unknown"
- else:
- return textNode.data
- else:
- return "unknown"
- else:
- return "unknown"
+ if textNode and not textNode.data.isspace():
+ return textNode.data
+ # otherwise
+ return ""
+
def setOS(self, tag, value):
Modified: trunk/v7/hardwaretest.py
===================================================================
--- trunk/v7/hardwaretest.py 2012-04-20 13:25:08 UTC (rev 1289)
+++ trunk/v7/hardwaretest.py 2012-04-20 13:27:43 UTC (rev 1290)
@@ -246,7 +246,7 @@
self.certification.getHardware(Tags.model))
self.getOSInfo()
if self.options.mode != Constants.auto:
- self.catalog.getCertificationID(self.certification)
+ self.editCertification()
# save the certification info off to certification.xml
certificationDocument = CertificationDocument()
@@ -1124,25 +1124,11 @@
elif arch in ['s390','s390x']:
vendor = 'IBM'
make = 'eServer zSeries'
-
- # try asking the humans for it
- if self.options.mode == Constants.normal:
- print "Please verify the vendor, make, and model:"
- vendor = self.ui.promptEdit("Vendor: ", vendor)
- if vendor:
- self.certification.setHardware(Tags.vendor, vendor)
- make = self.ui.promptEdit("Make: ", make)
- if make:
- self.certification.setHardware(Tags.make, make)
- model = self.ui.promptEdit("Model: ", model)
- if model:
- self.certification.setHardware(Tags.model, model)
-
- else: # --mode auto
- self.certification.setHardware(Tags.model, model)
- self.certification.setHardware(Tags.make, make)
- self.certification.setHardware(Tags.vendor, vendor)
+
+ self.certification.setHardware(Tags.model, model)
+ self.certification.setHardware(Tags.make, make)
+ self.certification.setHardware(Tags.vendor, vendor)
def getArch(self):
@@ -1408,21 +1394,25 @@
certificationID = self.certification.getCertificationID()
- answers = None
- if certificationID:
+
+ # if the certification id isn't set yet - see if they want to use the catalog
+ if not certificationID:
+ self.catalog.getCertificationID(self.certification)
+ # else, let them edit it directly
+ else:
answers = list()
answers.append(str(certificationID))
- while True:
- value = self.ui.prompt("\nPlease enter the certification ID:", answers)
- if not value:
- break
- try:
- int(value)
- break
- except ValueError:
- print "Error: %s is not an integer." % value
- if value and int(value) >= 0:
- self.certification.setCertificationID(value)
+ while True:
+ value = self.ui.prompt("\nPlease enter the certification ID:", answers)
+ if not value:
+ break
+ try:
+ int(value)
+ break
+ except ValueError:
+ print "Error: %s is not an integer." % value
+ if value and int(value) >= 0:
+ self.certification.setCertificationID(value)
# copy over to certification.xml
12 years