r1169 - trunk/tools
by gnichols＠fedoraproject.org
Author: gnichols
Date: 2012-01-30 13:54:52 +0000 (Mon, 30 Jan 2012)
New Revision: 1169
Modified:
trunk/tools/v7-release.py
Log:
cvs to rhpkg and git
Modified: trunk/tools/v7-release.py
===================================================================
--- trunk/tools/v7-release.py 2012-01-30 13:53:55 UTC (rev 1168)
+++ trunk/tools/v7-release.py 2012-01-30 13:54:52 UTC (rev 1169)
@@ -52,7 +52,8 @@
print command
os.system(command)
# command = "make tag"
-command = "git tag"
+tag = ("v7-%s-%s.el%s" % (v7.version.version, v7.version.release, v7.version.rhel_version)).replace('.','_')
+command = "git tag " + tag
print command
os.system(command)
@@ -63,7 +64,7 @@
tag = "hwcert-%sE" % v7.version.rhel_version
# command = "make build COLLECTION=%s" % tag
-command = "rhpkg build COLLECTION=%s" % tag
+command = "rhpkg build"
print command
os.system(command)
12 years, 3 months
r1168 - trunk
by gnichols＠fedoraproject.org
Author: gnichols
Date: 2012-01-30 13:53:55 +0000 (Mon, 30 Jan 2012)
New Revision: 1168
Modified:
trunk/Makefile
Log:
R2
Modified: trunk/Makefile
===================================================================
--- trunk/Makefile 2012-01-27 15:14:38 UTC (rev 1167)
+++ trunk/Makefile 2012-01-30 13:53:55 UTC (rev 1168)
@@ -14,7 +14,7 @@
# Author: Greg Nichols
V7_VERSION := 1.5
-V7_RELEASE := 1
+V7_RELEASE := 2
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, 3 months
r1167 - tags
by gnichols＠fedoraproject.org
Author: gnichols
Date: 2012-01-27 15:14:38 +0000 (Fri, 27 Jan 2012)
New Revision: 1167
Added:
tags/v7-V1-5R1/
Log:
tag version
12 years, 3 months
r1166 - trunk
by gnichols＠fedoraproject.org
Author: gnichols
Date: 2012-01-27 15:13:40 +0000 (Fri, 27 Jan 2012)
New Revision: 1166
Modified:
trunk/v7.spec.in
Log:
changelog
Modified: trunk/v7.spec.in
===================================================================
--- trunk/v7.spec.in 2012-01-25 18:57:31 UTC (rev 1165)
+++ trunk/v7.spec.in 2012-01-27 15:13:40 UTC (rev 1166)
@@ -24,6 +24,8 @@
Obsoletes: hts
Requires: lmbench, dt, httpd, nfs-utils, stress, gcc, PyXML, rpm-build
Requires: dbus-python, kernel-devel, kernel-headers
+# RHEL6
+Requires: udisks
# v7-server subpackage
%package server
@@ -77,6 +79,12 @@
%changelog
+* Fri Jan 27 2012 Greg Nichols <gnichols(a)redhat.com>
+
+V7 1.5 R1
+
+ 782197 - FEAT: v7 should support dbus udisks in place of hal/kudzu/hardware.py for storage test
+
* Fri Jan 21 2012 Greg Nichols <gnichols(a)redhat.com>
V7 1.5 R0
@@ -85,8 +93,8 @@
754919 - bluray: not choosing the most capable media type as default
707144 - Regression with BLURAY test in v7 version 1.3-43-el6
705999 - v7 --help doesn't give information about "v7 save"
- 782197 - FEAT: v7 should support dbus udisks in place of hal/kudzu/hardware.py for storage test
+
* Thu Nov 03 2011 Greg Nichols <gnichols(a)redhat.com>
V7 1.4 R38
12 years, 3 months
r1165 - trunk/tools
by gnichols＠fedoraproject.org
Author: gnichols
Date: 2012-01-25 18:57:31 +0000 (Wed, 25 Jan 2012)
New Revision: 1165
Modified:
trunk/tools/v7-release.py
Log:
move from dist cvs to dist git
Modified: trunk/tools/v7-release.py
===================================================================
--- trunk/tools/v7-release.py 2012-01-23 20:46:52 UTC (rev 1164)
+++ trunk/tools/v7-release.py 2012-01-25 18:57:31 UTC (rev 1165)
@@ -4,13 +4,18 @@
This script automates submission of v7 to the brew build system
by checking in a new tarball and updated rpm spec file.
+Update:01-25-12 - changed to accomodate dist move from cvs to git/rhpkg
+
+You need to install Red Hat's rhpkg rpm for this script to work
+
To use in a specific development environment, two directories must
be configured:
-buildDir - a local cvs checkout of /cvs/qa - HTS's source where the developer
-has built v7 via "make rpm" from source.
+buildDir - a local svn checkout of ssh://svn.fedorahosted.org/svn/v7 - v7's source where the developer
+has built v7 via "make rpm" from source (AKA upstream)
-distDir - a local cvs checkout of /cvs/dist/v7 - the brew-managed HTS source
+distDir - a local git/rhpkg checkout of git://pkgs.devel.redhat.com/rpms/v7 - the brew-managed v7 source
+(AKA downstream)
"""
import os,sys,shutil
@@ -36,15 +41,18 @@
shutil.copy(os.path.join(buildDir, "v7.spec"), "v7.spec")
# upload the tarball
-command = "make upload FILES=%s" % sourceTar
+# command = "make upload FILES=%s" % sourceTar
+command = "rhpkg upload %s" % sourceTar
print command
os.system(command)
# commit the new source and spec
-command = "cvs commit -m \"R%s\" . " % v7.version.release
+# command = "cvs commit -m \"R%s\" . " % v7.version.release
+command = "rhpkg commit -p -m \"R%s\" . " % v7.version.release
print command
os.system(command)
-command = "make tag"
+# command = "make tag"
+command = "git tag"
print command
os.system(command)
@@ -54,7 +62,8 @@
else:
tag = "hwcert-%sE" % v7.version.rhel_version
-command = "make build COLLECTION=%s" % tag
+# command = "make build COLLECTION=%s" % tag
+command = "rhpkg build COLLECTION=%s" % tag
print command
os.system(command)
12 years, 3 months
r1164 - trunk/v7
by gnichols＠fedoraproject.org
Author: gnichols
Date: 2012-01-23 20:46:52 +0000 (Mon, 23 Jan 2012)
New Revision: 1164
Modified:
trunk/v7/documentbase.py
Log:
Bug 782197 - FEAT: v7 should support dbus udisks in place of hal/kudzu/hardware.py for storage test
Modified: trunk/v7/documentbase.py
===================================================================
--- trunk/v7/documentbase.py 2012-01-23 19:34:06 UTC (rev 1163)
+++ trunk/v7/documentbase.py 2012-01-23 20:46:52 UTC (rev 1164)
@@ -150,14 +150,16 @@
self.setAttribute(deviceElement, Attributes.product, device.getProduct())
self.setAttribute(deviceElement, Attributes.device_bus, device.getBus())
self.setAttribute(deviceElement, Attributes.device_class, device.getClass())
+ print "set device-class in document to " + device.getClass()
self.setAttribute(deviceElement, Attributes.source, device.getSource())
for (key, value) in device.properties.iteritems():
- propertyElement = self.document.createElement(Tags.property)
- self.setAttribute(propertyElement, Tags.name, key)
- if value:
+ # only create a property element if the value is there (some string, non-zero integer, or True).
+ if value:
+ propertyElement = self.document.createElement(Tags.property)
+ self.setAttribute(propertyElement, Tags.name, key)
self.setTextNode(propertyElement, "%s" % value)
- deviceElement.appendChild(propertyElement)
+ deviceElement.appendChild(propertyElement)
self.element.appendChild(deviceElement)
12 years, 3 months
r1163 - trunk/v7
by gnichols＠fedoraproject.org
Author: gnichols
Date: 2012-01-23 19:34:06 +0000 (Mon, 23 Jan 2012)
New Revision: 1163
Modified:
trunk/v7/device.py
Log:
Bug 782197 - FEAT: v7 should support dbus udisks in place of hal/kudzu/hardware.py for storage test
Modified: trunk/v7/device.py
===================================================================
--- trunk/v7/device.py 2012-01-23 19:12:16 UTC (rev 1162)
+++ trunk/v7/device.py 2012-01-23 19:34:06 UTC (rev 1163)
@@ -121,6 +121,7 @@
class KudzuDevice(Device):
def __init__(self, properties=None):
Device.__init__(self, None, properties=properties)
+ self.udi = self.getProperty("udi")
def getSource(self):
return Constants.kudzu
12 years, 3 months
r1162 - trunk/v7
by gnichols＠fedoraproject.org
Author: gnichols
Date: 2012-01-23 19:12:16 +0000 (Mon, 23 Jan 2012)
New Revision: 1162
Modified:
trunk/v7/planner.py
Log:
Bug 782197 - FEAT: v7 should support dbus udisks in place of hal/kudzu/hardware.py for storage test
Modified: trunk/v7/planner.py
===================================================================
--- trunk/v7/planner.py 2012-01-23 19:11:24 UTC (rev 1161)
+++ trunk/v7/planner.py 2012-01-23 19:12:16 UTC (rev 1162)
@@ -28,6 +28,7 @@
from v7.v7kudzu import Kudzu
from v7.udevDeviceDetector import UdevDeviceDetector
from v7.procDeviceDetector import ProcDeviceDetector
+from v7.udisksDeviceDetector import UDisksDeviceDetector
class Planner:
@@ -124,6 +125,8 @@
if self.options.kudzu or not hal.enabled:
kudzu = Kudzu()
self.devices.extend(kudzu.getDevices())
+ udisks = UDisksDeviceDetector()
+ self.devices.extend(udisks.getDevices())
def getTestsFor(self, device):
devices = list()
12 years, 3 months
r1161 - trunk
by gnichols＠fedoraproject.org
Author: gnichols
Date: 2012-01-23 19:11:24 +0000 (Mon, 23 Jan 2012)
New Revision: 1161
Modified:
trunk/Makefile
Log:
R1
Modified: trunk/Makefile
===================================================================
--- trunk/Makefile 2012-01-20 18:04:43 UTC (rev 1160)
+++ trunk/Makefile 2012-01-23 19:11:24 UTC (rev 1161)
@@ -14,7 +14,7 @@
# Author: Greg Nichols
V7_VERSION := 1.5
-V7_RELEASE := 0
+V7_RELEASE := 1
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, 3 months
r1160 - tags
by gnichols＠fedoraproject.org
Author: gnichols
Date: 2012-01-20 18:04:43 +0000 (Fri, 20 Jan 2012)
New Revision: 1160
Added:
tags/v7-V1-5R0/
Log:
tag version
12 years, 3 months