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)