The branch, master has been updated via fec0edd Remove old build rather than uploaded build. via 780543f Split up revision_link function. via fdf6d7e Fix instructions to mention admin.py. from 6a76d19 fix broken parameter
http://gitweb.samba.org/?p=build-farm.git;a=shortlog;h=master - Log ----------------------------------------------------------------- commit fec0edd4ec6457607e15071e59da2a6af03c2786 Author: jel...@samba.org <jel...@samba.org> Date: Wed Nov 24 10:48:46 2010 +0100 Remove old build rather than uploaded build. commit 780543f2149420496d257f8b854c5e024765ce83 Author: jel...@samba.org <jel...@samba.org> Date: Wed Nov 24 00:30:13 2010 +0100 Split up revision_link function. commit fdf6d7e675f1d4f332e4e750cde87315850153c4 Author: jel...@samba.org <jel...@samba.org> Date: Wed Nov 24 00:02:42 2010 +0100 Fix instructions to mention admin.py. ----------------------------------------------------------------------- Summary of changes: README | 2 +- buildfarm/web/__init__.py | 10 ++++++++-- import-and-analyse.py | 18 +++++++++--------- 3 files changed, 18 insertions(+), 12 deletions(-) Changeset truncated at 500 lines: diff --git a/README b/README index 83016ad..e1fe3fe 100644 --- a/README +++ b/README @@ -11,6 +11,6 @@ To set it up on a new box you need to do this: in ~build/build_farm/build_test.settings.local 5) arrange for ~build/build_farm/build_test to be run regularly from cron -6) add the host to svn://svn.samba.org/home/svn/build-farm/trunk/web/hosts.list +6) add the host to the buildfarm using admin.py. 7) if desired, create a HOSTNAME.fns file that defines what gets built on build.samba.org diff --git a/buildfarm/web/__init__.py b/buildfarm/web/__init__.py index f4e284b..c4ff3f9 100755 --- a/buildfarm/web/__init__.py +++ b/buildfarm/web/__init__.py @@ -128,7 +128,8 @@ def build_uri(myself, build): } if build.revision: params["revision"] = build.revision - return "%s?function=View+Build;%s" % (myself, ";".join(["%s=%s" % k for k in params.iteritems()])) + return "%s?function=View+Build;%s" % ( + myself, ";".join(["%s=%s" % k for k in params.iteritems()])) def build_link(myself, build): @@ -142,11 +143,16 @@ def host_link(myself, host): return "<a href='%s'>%s</a>" % (host_uri(myself, host), host) +def revision_uri(myself, revision, tree): + return "%s?function=diff;tree=%s;revision=%s" % (myself, tree, revision) + + def revision_link(myself, revision, tree): """return a link to a particular revision""" if revision is None: return "unknown" - return "<a href='%s?function=diff;tree=%s;revision=%s' title='View Diff for %s'>%s</a>" % (myself, tree, revision, revision, revision[:7]) + return "<a href='%s' title='View Diff for %s'>%s</a>" % ( + revision_uri(myself, revision, tree), revision, revision[:7]) def subunit_to_buildfarm_result(subunit_result): diff --git a/import-and-analyse.py b/import-and-analyse.py index ee10fbb..ef6390c 100755 --- a/import-and-analyse.py +++ b/import-and-analyse.py @@ -100,17 +100,18 @@ for build in buildfarm.get_new_builds(): continue if not opts.dry_run: + old_build = build try: - build = buildfarm.builds.upload_build(build) + build = buildfarm.builds.upload_build(old_build) + except MissingRevisionInfo: + print "No revision info in %r, skipping" % build + continue + else: + try: + rev = build.revision_details() except MissingRevisionInfo: print "No revision info in %r, skipping" % build continue - - try: - rev = build.revision_details() - except MissingRevisionInfo: - print "No revision info in %r, skipping" % build - continue if opts.verbose >= 2: print "%s... " % build, @@ -137,8 +138,7 @@ for build in buildfarm.get_new_builds(): check_and_send_mails(build, prev_build) if not opts.dry_run: - # When the new web script is introduced, kill the build here: - build.remove() + old_build.remove() buildfarm.commit() smtp.quit() -- build.samba.org