From 4832204677c47b88bfa2e12fa142b96fd4bb7740 Mon Sep 17 00:00:00 2001
From: "rcampbell%mozilla.com"
 <rcampbell%mozilla.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Thu, 17 Jan 2008 20:04:41 +0000
Subject: [PATCH] 412483 - move branch builders to branch bonsai poller

git-svn-id: svn://10.0.0.236/trunk@243394 18797224-902f-48f8-a5cc-f745e15eee43
---
 .../testing/sisyphus/master.cfg               | 35 +++++++++++++------
 1 file changed, 25 insertions(+), 10 deletions(-)

diff --git a/mozilla/tools/buildbot-configs/testing/sisyphus/master.cfg b/mozilla/tools/buildbot-configs/testing/sisyphus/master.cfg
index 61e7b52a0af..0cb461bfd8a 100644
--- a/mozilla/tools/buildbot-configs/testing/sisyphus/master.cfg
+++ b/mozilla/tools/buildbot-configs/testing/sisyphus/master.cfg
@@ -78,12 +78,13 @@ c['sources'] = []
 c['sources'].append(bonsaipoller.BonsaiPoller(
                     bonsaiURL = "http://bonsai.mozilla.org",
                     module = "PhoenixTinderbox",
-                    branch = "HEAD",
+                    branch = "1.9",
                     pollInterval = 1 * 60))
+
 c['sources'].append(bonsaipoller.BonsaiPoller(
                     bonsaiURL = "http://bonsai.mozilla.org",
                     module = "AviarySuiteBranchTinderbox",
-                    branch = "BRANCH_1_8",
+                    branch = "1.8.1",
                     pollInterval = 1 * 60))
 
 ####### SCHEDULERS
@@ -91,37 +92,51 @@ c['sources'].append(bonsaipoller.BonsaiPoller(
 ## configure the Schedulers
 
 builderLinuxQmJstest0119Shell = "jstest linux qm-jstest01 1.9 shell"
-builderOSXPPCPapaya181Shell   = "jstest os x ppc papaya 1.8.1 shell"
 builderOSXPPCPineapple19Shell = "jstest os x ppc pineapple 1.9 shell"
 
 from buildbot.scheduler import Scheduler
 c['schedulers'] = []
-c['schedulers'].append(Scheduler(name="js", branch="HEAD",
+c['schedulers'].append(Scheduler(name="js", branch="1.9",
                                  treeStableTimer=2*60,
                                  builderNames=[builderLinuxQmJstest0119Shell,
-                                               builderOSXPPCPapaya181Shell,
                                                builderOSXPPCPineapple19Shell]))
 
+builderOSXPPCPapaya181Shell   = "jstest os x ppc papaya 1.8.1 shell"
+
+c['shedulers'].append(Scheduler(name="js branch", branch="1.8.1",
+                                treeStableTimer=2*60,
+                                builderNames=[builderOSXPPCPapaya181Shell]))
+
 builderLinuxQmJstest0119BrowserDebug = "jstest linux qm-jstest01 1.9 browser debug"
-builderOSXPPCPapaya181BrowserDebug   = "jstest os x ppc papaya 1.8.1 browser debug"
 builderOSXPPCPineapple19BrowserDebug = "jstest os x ppc pineapple 1.9 browser debug"
 
-c['schedulers'].append(Nightly(name="nightly debug browser", branch="HEAD",
+c['schedulers'].append(Nightly(name="nightly 1.9 browser debug", branch="1.9",
                                builderNames=[builderLinuxQmJstest0119BrowserDebug,
-                                             builderOSXPPCPapaya181BrowserDebug,
                                              builderOSXPPCPineapple19BrowserDebug],
                                hour=0, minute=0))
 
+builderOSXPPCPapaya181BrowserDebug   = "jstest os x ppc papaya 1.8.1 browser debug"
+
+c['schedulers'].append(Nightly(name="nightly 1.8.1 browser debug", branch="1.8.1",
+                               builderNames=[builderOSXPPCPapaya181BrowserDebug],
+                               hour=0, minute=0))
+
 builderLinuxQmJstest0119BrowserOpt = "jstest linux qm-jstest01 1.9 browser opt"
-builderOSXPPCPapaya181BrowserOpt   = "jstest os x ppc papaya 1.8.1 browser opt"
 builderOSXPPCPineapple19BrowserOpt = "jstest os x ppc pineapple 1.9 browser opt"
 
-c['schedulers'].append(Nightly(name="nightly opt browser", branch="HEAD",
+c['schedulers'].append(Nightly(name="nightly 1.9  browser opt", branch="1.9",
                                builderNames=[builderLinuxQmJstest0119BrowserOpt,
                                              builderOSXPPCPapaya181BrowserOpt,
                                              builderOSXPPCPineapple19BrowserOpt],
                                hour=5, minute=0))
 
+builderOSXPPCPapaya181BrowserOpt   = "jstest os x ppc papaya 1.8.1 browser opt"
+
+c['schedulers'].append(Nightly(name="nightly 1.8.1 browser opt", branch="1.8.1",
+                               builderNames=[builderOSXPPCPapaya181BrowserOpt],
+                               hour=5, minute=0))
+
+
 ####### BUILDERS
 
 SISYPHUS_BASE = "/work/mozilla/mozilla.com/test.mozilla.com/www"