[Buildbot-commits] buildbot ChangeLog,1.466,1.467 Makefile,1.13,1.14

Tue Jul 19 23:12:03 UTC 2005

Update of /cvsroot/buildbot/buildbot
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17398

Modified Files:
	ChangeLog Makefile 
Log Message:
Revision: arch at buildbot.sf.net--2004/buildbot--dev--0--patch-239
Creator:  Brian Warner <warner at monolith.lothar.com>

merge in build-on-branch code: Merged from warner at monolith.lothar.com--2005 (patch 0-18, 40-41)

Patches applied:

 * warner at monolith.lothar.com--2005/buildbot--dev--0--patch-40
   Merged from arch at buildbot.sf.net--2004 (patch 232-238)

 * warner at monolith.lothar.com--2005/buildbot--dev--0--patch-41
   Merged from local-usebranches (warner at monolith.lothar.com--2005/buildbot--usebranches--0( (patch 0-18)

 * warner at monolith.lothar.com--2005/buildbot--usebranches--0--base-0
   tag of warner at monolith.lothar.com--2005/buildbot--dev--0--patch-38

 * warner at monolith.lothar.com--2005/buildbot--usebranches--0--patch-1
   rearrange build scheduling

 * warner at monolith.lothar.com--2005/buildbot--usebranches--0--patch-2
   replace ugly 4-tuple with a distinct SourceStamp class

 * warner at monolith.lothar.com--2005/buildbot--usebranches--0--patch-3
   document upcoming features, clean up CVS branch= argument

 * warner at monolith.lothar.com--2005/buildbot--usebranches--0--patch-4
   Merged from arch at buildbot.sf.net--2004 (patch 227-231), warner at monolith.lothar.com--2005 (patch 39)

 * warner at monolith.lothar.com--2005/buildbot--usebranches--0--patch-5
   implement per-Step Locks, add tests (which all fail)

 * warner at monolith.lothar.com--2005/buildbot--usebranches--0--patch-6
   implement scheduler.Dependent, add (failing) tests

 * warner at monolith.lothar.com--2005/buildbot--usebranches--0--patch-7
   make test_dependencies work

 * warner at monolith.lothar.com--2005/buildbot--usebranches--0--patch-8
   finish making Locks work, tests now pass

 * warner at monolith.lothar.com--2005/buildbot--usebranches--0--patch-9
   fix test failures when run against twisted >2.0.1

 * warner at monolith.lothar.com--2005/buildbot--usebranches--0--patch-10
   rename test_interlock.py to test_locks.py

 * warner at monolith.lothar.com--2005/buildbot--usebranches--0--patch-11
   add more Locks tests, add branch examples to manual

 * warner at monolith.lothar.com--2005/buildbot--usebranches--0--patch-12
   rewrite test_vc.py, create repositories in setUp rather than offline

 * warner at monolith.lothar.com--2005/buildbot--usebranches--0--patch-13
   make new tests work with twisted-1.3.0

 * warner at monolith.lothar.com--2005/buildbot--usebranches--0--patch-14
   implement/test build-on-branch for most VC systems

 * warner at monolith.lothar.com--2005/buildbot--usebranches--0--patch-15
   minor changes: test-case-name tags, init cleanup

 * warner at monolith.lothar.com--2005/buildbot--usebranches--0--patch-16
   Merged from arch at buildbot.sf.net--2004 (patch 232-233)

 * warner at monolith.lothar.com--2005/buildbot--usebranches--0--patch-17
   Merged from arch at buildbot.sf.net--2004 (patch 234-236)

 * warner at monolith.lothar.com--2005/buildbot--usebranches--0--patch-18
   Merged from arch at buildbot.sf.net--2004 (patch 237-238), warner at monolith.lothar.com--2005 (patch 40)


Index: ChangeLog
===================================================================
RCS file: /cvsroot/buildbot/buildbot/ChangeLog,v
retrieving revision 1.466
retrieving revision 1.467
diff -u -d -r1.466 -r1.467

--- ChangeLog	19 Jul 2005 19:49:35 -0000	1.466
+++ ChangeLog	19 Jul 2005 23:12:00 -0000	1.467
@@ -1,5 +1,14 @@
 2005-07-19  Brian Warner  <warner at lothar.com>
 
+	* buildbot/test/test_slaves.py: stubs for new test case
+
+	* buildbot/scheduler.py: add test-case-name tag
+	* buildbot/test/test_buildreq.py: same
+
+	* buildbot/slave/bot.py (SlaveBuilder.__init__): remove some
+	unnecessary init code
+	(Bot.remote_setBuilderList): match it
+
 	* docs/buildbot.texinfo (@settitle): don't claim version 1.0
 
 	* buildbot/changes/mail.py (parseSyncmail): update comment
@@ -38,6 +47,155 @@
 	'freebsd' builders, since the buildslaves have been unavailable
 	for quite a while
 
+2005-07-13  Brian Warner  <warner at lothar.com>
+
+	* buildbot/test/test_vc.py (VCBase.do_branch): test the new
+	build-on-branch feature
+
+	* buildbot/process/step.py (Darcs.__init__): add base_url and
+	default_branch arguments, just like SVN
+	(Arch.__init__): note that the version= argument is really the
+	default branch name
+
+	* buildbot/slave/commands.py (SourceBase): keep track of the
+	repository+branch that was used for the last checkout in
+	SRCDIR/.buildbot-sourcedata . If the contents of this file do not
+	match, we clobber the directory and perform a fresh checkout
+	rather than trying to do an in-place update. This should protect
+	us against trying to get to branch B by doing an update in a tree
+	obtained from branch A.
+	(CVS.setup): add CVS-specific sourcedata: root, module, and branch
+	(SVN.setup): same, just the svnurl
+	(Darcs.setup): same, just the repourl
+	(Arch.setup): same, arch coordinates (url), version, and
+	buildconfig. Also pull the buildconfig from the args dictionary,
+	which we weren't doing before, so the build-config was effectively
+	disabled.
+	(Arch.sourcedirIsUpdateable): don't try to update when we're
+	moving to a specific revision: arch can't go backwards, so it is
+	safer to just clobber the tree and checkout a new one at the
+	desired revision.
+	(Bazaar.setup): same sourcedata as Arch
+
+	* buildbot/test/test_dependencies.py (Dependencies.testRun_Fail):
+	use maybeWait, to work with twisted-1.3.0 and twcompat
+	(Dependencies.testRun_Pass): same
+
+	* buildbot/test/test_vc.py: rearrange, cleanup
+
+	* buildbot/twcompat.py: add defer.waitForDeferred and
+	utils.getProcessOutputAndValue, so test_vc.py (which uses them)
+	can work under twisted-1.3.0 .
+
+	* buildbot/test/test_vc.py: rewrite. The sample repositories are
+	now created at setUp time. This increases the runtime of the test
+	suite considerably (from 91 seconds to 151), but it removes the
+	need for an offline tarball, which should solve a problem I've
+	seen where the test host has a different version of svn than the
+	tarball build host. The new code also validates that mode=update
+	really picks up recent commits. This approach will also make it
+	easier to test out branches, because the code which creates the VC
+	branches is next to the code which uses them. It will also make it
+	possible to test some change-notification hooks, by actually
+	performing a VC commit and watching to see the ChangeSource get
+	notified.
+
+2005-07-12  Brian Warner  <warner at lothar.com>
+
+	* docs/buildbot.texinfo (SVN): add branches example
+	* docs/Makefile (buildbot.ps): add target for postscript manual
+
+	* buildbot/test/test_dependencies.py: s/test_interlocks/test_locks/ 
+	* buildbot/test/test_locks.py: same
+
+	* buildbot/process/step.py (Darcs): comment about default branches
+
+	* buildbot/master.py (BuildMaster.loadConfig): don't look for
+	c['interlocks'] in the config file, complain if it is present.
+	Scan all locks in c['builders'] to make sure the Locks they use
+	are uniquely named.
+	* buildbot/test/test_config.py: remove old c['interlocks'] test,
+	add some tests to check for non-uniquely-named Locks
+	* buildbot/test/test_vc.py (Patch.doPatch): fix factory.steps,
+	since the unique-Lock validation code requires it now
+
+	* buildbot/locks.py: fix test-case-name
+
+	* buildbot/interlock.py: remove old file
+
+2005-07-11  Brian Warner  <warner at lothar.com>
+
+	* buildbot/test/test_interlock.py: rename to..
+	* buildbot/test/test_locks.py: .. something shorter
+
+	* buildbot/slave/bot.py (BuildSlave.stopService): newer Twisted
+	versions (after 2.0.1) changed internet.TCPClient to shut down the
+	connection in stopService. Change the code to handle this
+	gracefully.
+
+	* buildbot/process/base.py (Build): handle whole-Build locks
+	* buildbot/process/builder.py (Builder.compareToSetup): same
+	* buildbot/test/test_interlock.py: make tests work
+
+	* buildbot/process/step.py (BuildStep.startStep): complain if a
+	Step tries to claim a lock that's owned by its own Build
+	(BuildStep.releaseLocks): typo
+
+	* buildbot/locks.py (MasterLock): use ComparableMixin so config
+	file reloads don't replace unchanged Builders
+	(SlaveLock): same
+	* buildbot/test/test_config.py (ConfigTest.testInterlocks):
+	rewrite to cover new Locks instead of old c['interlocks']
+	* buildbot/test/runutils.py (RunMixin.connectSlaves): remember
+	slave2 too
+
+
+	* buildbot/test/test_dependencies.py (Dependencies.setUp): always
+	start the master and connect the buildslave
+
+	* buildbot/process/step.py (FailingDummy.done): finish with a
+	FAILURE status rather than raising an exception
+
+	* buildbot/process/base.py (BuildRequest.mergeReasons): don't try to
+	stringify a BuildRequest.reason that is None
+
+	* buildbot/scheduler.py (BaseUpstreamScheduler.buildSetFinished):
+	minor fix
+	* buildbot/status/builder.py (BuildSetStatus): implement enough to
+	allow scheduler.Dependent to work
+	* buildbot/buildset.py (BuildSet): set .reason and .results
+
+	* buildbot/test/test_interlock.py (Locks.setUp): connect both
+	slaves, to make the test stop hanging. It still fails, of course,
+	because I haven't even started to implement Locks.
+
+	* buildbot/test/runutils.py (RunMixin.connectSlaves): new utility
+
+	* docs/buildbot.texinfo (Build-Dependencies): redesign the feature
+	* buildbot/interfaces.py (IUpstreamScheduler): new Interface
+	* buildbot/scheduler.py (BaseScheduler): factor out common stuff
+	(Dependent): new class for downstream build dependencies
+	* buildbot/test/test_dependencies.py: tests (still failing)
+
+	* buildbot/buildset.py (BuildSet.waitUntilSuccess): minor notes
+
+2005-07-07  Brian Warner  <warner at lothar.com>
+
+	* buildbot/test/runutils.py (RunMixin): factored this class out..
+	* buildbot/test/test_run.py: .. from here
+	* buildbot/test/test_interlock.py: removed old c['interlock'] tests,
+	added new buildbot.locks tests (which all hang right now)
+	* buildbot/locks.py (SlaveLock, MasterLock): implement Locks
+	* buildbot/process/step.py: claim/release per-BuildStep locks
+
+	* docs/Makefile: add 'buildbot.html' target
+
+	* buildbot/process/step.py (CVS.__init__): allow branch=None to be
+	interpreted as "HEAD", so that all VC steps can accept branch=None
+	and have it mean the "default branch".
+
+	* docs/buildbot.texinfo: add Schedulers, Dependencies, and Locks
+
 2005-07-07  Brian Warner  <warner at lothar.com>
 
 	* docs/examples/twisted_master.cfg: update to match current usage
@@ -60,6 +218,29 @@
 	* MANIFEST.in: same
 	* Makefile (release): same
 
+2005-06-07  Brian Warner  <warner at lothar.com>
+
+	* everything: create a distinct SourceStamp class to replace the
+	ungainly 4-tuple, let it handle merging instead of BuildRequest.
+	Changed the signature of Source.startVC to include the revision
+	information (instead of passing it through self.args). Implement
+	branches for SVN (now only Darcs/Git is missing support). Add more
+	Scheduler tests.
+
+2005-06-06  Brian Warner  <warner at lothar.com>
+
+	* everything: rearrange build scheduling. Create a new Scheduler
+	object (configured in c['schedulers'], which submit BuildSets to a
+	set of Builders. Builders can now use multiple slaves. Builds can
+	be run on alternate branches, either requested manually or driven
+	by changes. This changed some of the Status classes. Interlocks
+	are out of service until they've been properly split into Locks
+	and Dependencies. treeStableTimer, isFileImportant, and
+	periodicBuild have all been moved from the Builder to the
+	Scheduler.
+	(BuilderStatus.currentBigState): removed the 'waiting' and
+	'interlocked' states, removed the 'ETA' argument.
+
 2005-05-24  Brian Warner  <warner at lothar.com>
 
 	* buildbot/pbutil.py (ReconnectingPBClientFactory): Twisted-1.3

Index: Makefile
===================================================================
RCS file: /cvsroot/buildbot/buildbot/Makefile,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- Makefile	19 Jul 2005 01:55:21 -0000	1.13
+++ Makefile	19 Jul 2005 23:12:00 -0000	1.14
@@ -19,8 +19,6 @@
 test:
 	$(PP) trial $(TRIALARGS) $(TEST)
 
-test-vc:
-	$(PP) BUILDBOT_TEST_VC=$(PWD)/.. trial $(TRIALARGS) $(TEST) 
 
 #debuild -uc -us
 



