[virt-tools-list] [PATCH 4/5] v5.1: update autobuild.sh so it works

Gene Czarcinski gene at czarc.net
Mon Apr 8 18:56:42 UTC 2013


There a some problems with autobuild.sh and this patch addresses
them:

1. Some of the tests fail so temporarily comment out
"prython setup.py test" until things are fixed so the tests
run correctly.  At that time, this should be uncommented.

2. "python setup.py install" needs to use --root= instead
of --prefix=

3. For the rpmbuild, use dist/*.tar.gz instead of *.tar.gz

4. Add "export AUTOBUILD_OVERRIDE_VERSION=y" so that if
the version-id changes are applied, a simpler version-id
is used for autobuild.
.
Signed-off-by: Gene Czarcinski <gene at czarc.net>
---
 autobuild.sh | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/autobuild.sh b/autobuild.sh
index baa9482..0521165 100755
--- a/autobuild.sh
+++ b/autobuild.sh
@@ -9,11 +9,17 @@ if [ -z "$AUTOBUILD_INSTALL_ROOT" ] ; then
     exit 1
 fi
 
-python setup.py build
-python setup.py test
-python setup.py install --prefix=$AUTOBUILD_INSTALL_ROOT
+rm -rf MANIFEST dist/*
+
+# support version-id changes
+export AUTOBUILD_OVERRIDE_VERSION=y
+
 python setup.py sdist
 
+python setup.py build
+#python setup.py test
+python setup.py install --root=$AUTOBUILD_INSTALL_ROOT
+
 which /usr/bin/rpmbuild > /dev/null 2>&1 || exit 0
 
 if [ -n "$AUTOBUILD_COUNTER" ]; then
@@ -22,5 +28,5 @@ else
     NOW=`date +"%s"`
     EXTRA_RELEASE=".$USER$NOW"
 fi
-rpmbuild --nodeps --define "extra_release $EXTRA_RELEASE" -ta --clean *.tar.gz
+rpmbuild --nodeps --define "extra_release $EXTRA_RELEASE" -ta --clean dist/*.tar.gz
 
-- 
1.8.1.4




More information about the virt-tools-list mailing list