[Scummvm-cvs-logs] SF.net SVN: scummvm:[55996] buildbot/config/master.cfg

[dhewg at users.sourceforge.net]

Revision: 55996
          http://scummvm.svn.sourceforge.net/scummvm/?rev=55996&view=rev
Author:   dhewg
Date:     2011-05-02 16:37:32 +0000 (Mon, 02 May 2011)

Log Message:
-----------
BUILDBOT: Attempt to confuse buildbot less

It doesn't seem to like the recent disabling of the nightly schedulers,
so lets try to disable the related builders too.

Modified Paths:
--------------
    buildbot/config/master.cfg

Modified: buildbot/config/master.cfg
===================================================================
--- buildbot/config/master.cfg	2011-05-02 14:50:23 UTC (rev 55995)
+++ buildbot/config/master.cfg	2011-05-02 16:37:32 UTC (rev 55996)
@@ -16,7 +16,7 @@
 
 scumm_branch_master = "master"
 scumm_branch_master_desc = "master"
-# TODO
+
 scumm_branch_stable = "branch-1-3-0"
 scumm_branch_stable_desc = "stable"
 
@@ -693,14 +693,14 @@
 							branch = scumm_branch_master,
 							builderNames = [ "nightly-master" ],
 							hour = 4,
-							minute = 0,
+							minute = 1,
 							onlyIfChanged = True))
 
 if scumm_build_nightly_stable:
 	c["schedulers"].append(Nightly(name = "nightly_stable",
 							branch = scumm_branch_stable,
 							builderNames = [ "nightly-stable" ],
-							hour = 5,
+							hour = 4,
 							minute = 0,
 							onlyIfChanged = True))
 
@@ -763,37 +763,39 @@
 
 # Nightly builders
 
-f = factory.BuildFactory()
-f.addStep(scumm.Clean(prefix = "master"))
-f.addStep(Trigger(schedulerNames = [ "master" ],
-					updateSourceStamp = True,
-					waitForFinish = True,
-					set_properties = { "package": True }))
+if scumm_build_nightly_master:
+	f = factory.BuildFactory()
+	f.addStep(scumm.Clean(prefix = "master"))
+	f.addStep(Trigger(schedulerNames = [ "master" ],
+						updateSourceStamp = True,
+						waitForFinish = True,
+						set_properties = { "package": True }))
 
-c["builders"].append( {
-	"name": "nightly-master",
-	"slavename": "localslave",
-	"builddir": "nightly-master",
-	"factory": f,
-	"category": "nightly",
-	"locks": [ lock_src.access("exclusive") ]
-})
+	c["builders"].append( {
+		"name": "nightly-master",
+		"slavename": "localslave",
+		"builddir": "nightly-master",
+		"factory": f,
+		"category": "nightly",
+		"locks": [ lock_src.access("exclusive") ]
+	})
 
-f = factory.BuildFactory()
-f.addStep(scumm.Clean(prefix = "stable"))
-f.addStep(Trigger(schedulerNames = [ "stable" ],
-					updateSourceStamp = True,
-					waitForFinish = True,
-					set_properties = { "package": True }))
+if scumm_build_nightly_stable:
+	f = factory.BuildFactory()
+	f.addStep(scumm.Clean(prefix = "stable"))
+	f.addStep(Trigger(schedulerNames = [ "stable" ],
+						updateSourceStamp = True,
+						waitForFinish = True,
+						set_properties = { "package": True }))
 
-c["builders"].append( {
-	"name": "nightly-stable",
-	"slavename": "localslave",
-	"builddir": "nightly-stable",
-	"factory": f,
-	"category": "nightly",
-	"locks": [ lock_src.access("exclusive") ]
-})
+	c["builders"].append( {
+		"name": "nightly-stable",
+		"slavename": "localslave",
+		"builddir": "nightly-stable",
+		"factory": f,
+		"category": "nightly",
+		"locks": [ lock_src.access("exclusive") ]
+	})
 
 # Dynamic generated builders based on the platforms defined at the top of this file
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.