Merged in default (to get fx4.0.1 configs) production
authorChris AtLee <catlee@mozilla.com>
Thu, 14 Apr 2011 00:02:27 -0400
branchproduction
changeset 3929 70818a09be7edea927dde23f8ba9755f384434e1
parent 3913 f02b61a6586a22a8d56be9162f6be164a119bbe8 (current diff)
parent 3928 1eb1d4a628990076c7ea54f5f75827f071fbc232 (diff)
child 3930 f61b4d77bbd4b5db101fa161c4b24e9761d3fc68
push id3082
push usercatlee@mozilla.com
push dateThu, 14 Apr 2011 04:03:13 +0000
bugs649215, 631546, 648307, 607179, 647927, 649507, 642968, 648066, 649858, 646193
Merged in default (to get fx4.0.1 configs) changeset: 4072:ca5e78969aee parent: 4070:172a36b81d85 user: Aki Sasaki <asasaki@mozilla.com> date: Tue Apr 12 10:57:14 2011 -0700 summary: bug 649215 - disable tegra jsreftests temporarily. r=bear changeset: 4073:b2eddd6ca339 user: Armen Zambrano Gasparnian <armenzg@mozilla.com> date: Tue Apr 12 16:02:48 2011 -0400 summary: Bug 631546. Run unit tests and talos for mozilla-2.0 releases. r=lsblakk changeset: 4074:48bfd4f1471b user: Aki Sasaki <asasaki@mozilla.com> date: Tue Apr 12 17:51:28 2011 -0700 summary: bug 648307 - new mobile tp4 pageset. r=jhford changeset: 4075:0271461cc9e2 user: Aki Sasaki <asasaki@mozilla.com> date: Tue Apr 12 18:37:07 2011 -0700 summary: back out mobile tp4 pageset til we update graphserver changeset: 4076:899935372da8 user: John Hopkins <john.hopkins@mozillamessaging.com> date: Tue Apr 12 22:35:54 2011 -0700 summary: Add momo-vm-fedora12-05, momo-vm-fedora12-64-05. changeset: 4077:7b6c08bc2173 user: Chris AtLee <catlee@mozilla.com> date: Wed Apr 13 11:05:24 2011 -0400 summary: Bug 607179: Fix ports and names for buildbot-master{04,06}. r=bhearsum changeset: 4078:5d43b2558b5c user: Mark Banner <bugzilla@standard8.plus.com> date: Wed Apr 13 16:16:53 2011 +0100 summary: Attempt to fix Thunderbird Mac trunk builds, working around an issue due to the dual build system and mozconfig.common changeset: 4079:0e743bbb306c user: Phil Ringnalda <philringnalda@gmail.com> date: Wed Apr 13 12:00:34 2011 -0400 summary: Bug 647927: Enable spidermonkey builds that fail on warnings. r=catlee changeset: 4080:c4150f83ad3c user: Lukas Blakk <lsblakk@mozilla.com> date: Wed Apr 13 09:17:34 2011 -0700 summary: bug 649507 - toggle (off) graphics branch builds p=lsblakk r=catlee changeset: 4081:5987f33a3dac user: Chris AtLee <catlee@mozilla.com> date: Wed Apr 13 12:17:38 2011 -0400 summary: Bug 642968: Remove talos-master02 entries from setup-master.py, and localconfig changeset: 4082:5959fe6102ee user: Chris AtLee <catlee@mozilla.com> date: Wed Apr 13 12:20:37 2011 -0400 summary: Bug 647927: Back out 0e743bbb306c due to test failures. r=bustage changeset: 4083:d2d2d6c3ef57 user: Chris AtLee <catlee@mozilla.com> date: Wed Apr 13 15:34:28 2011 -0400 summary: Bug 648066: Re-enable updates on aurora branch. r=lsblakk changeset: 4084:95cc081632fe user: Chris AtLee <catlee@mozilla.com> date: Wed Apr 13 13:03:22 2011 -0400 summary: Bug 647927: Add spidermonkey builds that fail on warnings. r=bhearsum changeset: 4085:abd4dab93366 user: Dustin J. Mitchell <dustin@mozilla.com> date: Wed Apr 13 22:16:22 2011 -0500 summary: Bug 649858: align preproduction slave list with staging; r=nthomas changeset: 4086:1eb1d4a62899 tag: tip user: Chris AtLee <catlee@mozilla.com> date: Wed Apr 13 23:59:03 2011 -0400 summary: Bug 646193: Automation bumps for 4.0.1 r=nthomas
mozilla-tests/production_tests_master_talos-master02_localconfig.py
--- a/mozilla-tests/config.py
+++ b/mozilla-tests/config.py
@@ -345,28 +345,28 @@ PLATFORM_UNITTEST_VARS = {
                         },
                     )),
                     ('reftest-2', (
                         {'suite': 'reftest',
                          'totalChunks': 2,
                          'thisChunk': 2,
                         },
                     )),
-                    ('jsreftest-1', (
-                        {'suite': 'jsreftest',
-                         'totalChunks': 2,
-                         'thisChunk': 1,
-                        },
-                    )),
-                    ('jsreftest-2', (
-                        {'suite': 'jsreftest',
-                         'totalChunks': 2,
-                         'thisChunk': 2,
-                        },
-                    )),
+#                    ('jsreftest-1', (
+#                        {'suite': 'jsreftest',
+#                         'totalChunks': 2,
+#                         'thisChunk': 1,
+#                        },
+#                    )),
+#                    ('jsreftest-2', (
+#                        {'suite': 'jsreftest',
+#                         'totalChunks': 2,
+#                         'thisChunk': 2,
+#                        },
+#                    )),
                     ('crashtest', (
                         {'suite': 'crashtest'},
                     )),
                 ]
             },
         },
 }
 
@@ -573,16 +573,18 @@ BRANCHES['shadow-central']['a11y_tests']
 BRANCHES['shadow-central']['repo_path'] = "shadow-central"
 
 ######## mozilla-2.0
 BRANCHES['mozilla-2.0']['branch_name'] = "Firefox4.0"
 BRANCHES['mozilla-2.0']['mobile_branch_name'] = "Firefox4.0"
 BRANCHES['mozilla-2.0']['build_branch'] = "2.0"
 BRANCHES['mozilla-2.0']['talos_command'] = TALOS_CMD
 BRANCHES['mozilla-2.0']['fetch_symbols'] = True
+BRANCHES['mozilla-2.0']['release_tests'] = 5
+BRANCHES['mozilla-2.0']['fetch_release_symbols'] = False
 BRANCHES['mozilla-2.0']['support_url_base'] = 'http://build.mozilla.org/talos'
 BRANCHES['mozilla-2.0']['chrome_tests'] = (1, True, {}, ALL_PLATFORMS)
 BRANCHES['mozilla-2.0']['nochrome_tests'] = (1, True, {}, ALL_PLATFORMS)
 BRANCHES['mozilla-2.0']['dromaeo_tests'] = (1, True, {}, ALL_PLATFORMS)
 BRANCHES['mozilla-2.0']['dirty_tests'] = (1, True, TALOS_DIRTY_OPTS, ALL_PLATFORMS)
 BRANCHES['mozilla-2.0']['tp4_tests'] = (1, True, TALOS_TP4_OPTS, ALL_PLATFORMS)
 BRANCHES['mozilla-2.0']['cold_tests'] = (0, True, TALOS_DIRTY_OPTS, NO_WIN)
 BRANCHES['mozilla-2.0']['remote-ts_tests'] = (0, True, TALOS_REMOTE_FENNEC_OPTS, ANDROID)
--- a/mozilla-tests/production_tests_master_bm04_localconfig.py
+++ b/mozilla-tests/production_tests_master_bm04_localconfig.py
@@ -1,18 +1,18 @@
 c = BuildmasterConfig = {}
-c['slavePortnum'] = 9011
+c['slavePortnum'] = 9201
 
 from buildbot.status.html import WebStatus
 c['status'] = [
-        WebStatus(http_port=8011, allowForce=True)
+        WebStatus(http_port=8201, allowForce=True)
 ]
 
-c['buildbotURL'] = 'http://buildbot-master4.build.mozilla.org:8011/'
+c['buildbotURL'] = 'http://buildbot-master04.build.mozilla.org:8201/'
 
 from buildbot import manhole
-c['manhole'] = manhole.PasswordManhole("tcp:1236:interface=127.0.0.1", "cltbld", "password")
+c['manhole'] = manhole.PasswordManhole("tcp:7201:interface=127.0.0.1", "cltbld", "password")
 
 from config import BRANCHES, PLATFORMS, PROJECTS
 # Do everything!
 ACTIVE_BRANCHES = BRANCHES.keys()
 ACTIVE_PLATFORMS = dict((k,None) for k in PLATFORMS.keys())
 ACTIVE_PROJECTS = PROJECTS.keys()
--- a/mozilla-tests/production_tests_master_bm06_localconfig.py
+++ b/mozilla-tests/production_tests_master_bm06_localconfig.py
@@ -1,18 +1,18 @@
 c = BuildmasterConfig = {}
-c['slavePortnum'] = 9011
+c['slavePortnum'] = 9201
 
 from buildbot.status.html import WebStatus
 c['status'] = [
-        WebStatus(http_port=8011, allowForce=True)
+        WebStatus(http_port=8201, allowForce=True)
 ]
 
-c['buildbotURL'] = 'http://buildbot-master6.build.mozilla.org:8011/'
+c['buildbotURL'] = 'http://buildbot-master06.build.mozilla.org:8201/'
 
 from buildbot import manhole
-c['manhole'] = manhole.PasswordManhole("tcp:1236:interface=127.0.0.1", "cltbld", "password")
+c['manhole'] = manhole.PasswordManhole("tcp:7201:interface=127.0.0.1", "cltbld", "password")
 
 from config import BRANCHES, PLATFORMS, PROJECTS
 # Do everything!
 ACTIVE_BRANCHES = BRANCHES.keys()
 ACTIVE_PLATFORMS = dict((k,None) for k in PLATFORMS.keys())
 ACTIVE_PROJECTS = PROJECTS.keys()
deleted file mode 100644
--- a/mozilla-tests/production_tests_master_talos-master02_localconfig.py
+++ /dev/null
@@ -1,18 +0,0 @@
-c = BuildmasterConfig = {}
-c['slavePortnum'] = 9012
-
-from buildbot.status.html import WebStatus
-c['status'] = [
-        WebStatus(http_port=8012, allowForce=True)
-]
-
-c['buildbotURL'] = 'http://talos-master02.build.mozilla.org:8012/'
-
-from buildbot import manhole
-c['manhole'] = manhole.PasswordManhole("tcp:1235:interface=127.0.0.1", "cltbld", "password")
-
-from config import BRANCHES, PROJECTS
-# Do everything!
-ACTIVE_BRANCHES = BRANCHES.keys()
-ACTIVE_PLATFORMS = {'win32': None, 'linux64': None, 'macosx64': None}
-ACTIVE_PROJECTS = PROJECTS.keys()
--- a/mozilla/config.py
+++ b/mozilla/config.py
@@ -628,27 +628,35 @@ PROJECTS = {
     'valgrind': {
         'platforms': ['linux', 'linux64'],
         'job_interval': 24*3600, # Once a day
         'linux': {'env': PLATFORM_VARS['linux']['env']},
         'linux64': {'env': PLATFORM_VARS['linux64']['env']},
     },
     'spidermonkey': {
         'platforms': {
-            'linux-debug':    ['nomethodjit', 'notracejit'],
-            'linux64-debug':  ['nomethodjit', 'notracejit'],
+            'linux':          ['warnaserr'],
+            'linux-debug':    ['nomethodjit', 'notracejit', 'warnaserrdebug'],
+            'linux64':        ['warnaserr'],
+            'linux64-debug':  ['nomethodjit', 'notracejit', 'warnaserrdebug'],
             'win32-debug':    ['nomethodjit', 'notracejit'],
-            'macosx64-debug': ['nomethodjit', 'notracejit', 'dtrace', 'shark'],
-            'macosx-debug':   ['nomethodjit', 'notracejit', 'dtrace', 'shark'],
+            'macosx64':       ['warnaserr'],
+            'macosx64-debug': ['nomethodjit', 'notracejit', 'dtrace', 'shark', 'warnaserrdebug'],
+            'macosx':         ['warnaserr'],
+            'macosx-debug':   ['nomethodjit', 'notracejit', 'dtrace', 'shark', 'warnaserrdebug'],
         },
         'env': {
+            'linux': PLATFORM_VARS['linux']['env'],
             'linux-debug': PLATFORM_VARS['linux-debug']['env'],
+            'linux64': PLATFORM_VARS['linux64']['env'],
             'linux64-debug': PLATFORM_VARS['linux64-debug']['env'],
             'win32-debug': PLATFORM_VARS['win32-debug']['env'],
+            'macosx64': PLATFORM_VARS['macosx64']['env'],
             'macosx64-debug': PLATFORM_VARS['macosx64-debug']['env'],
+            'macosx': PLATFORM_VARS['macosx']['env'],
             'macosx-debug': PLATFORM_VARS['macosx-debug']['env'],
         },
         'hgurl': 'http://hg.mozilla.org',
         'repo_path': 'tracemonkey',
     },
 }
 
 for k, v in localconfig.PROJECTS.items():
--- a/mozilla/l10n-changesets_mozilla-2.0
+++ b/mozilla/l10n-changesets_mozilla-2.0
@@ -1,79 +1,79 @@
 af b0b4e441e0af
 ak b63976a41857
 ar 3764a411a4da
 ast 8a84432ae6dd
 be 4686c0e28473
 bg 38cf82c4bf61
 bn-BD 647810fa6de7
 bn-IN a3453f7e4311
-br e9fb501a06e5
-bs 174f984e527c
+br 270d187cc6e1
+bs 32f462fa7af5
 ca 5f007a4206b8
 cs 73a5c245ad92
 cy 0ec89c9336d8
 da 839821a80d2d
 de fe3e54984706
 el b22b656eec04
 en-GB 154b6a3b8560
 en-ZA 5651382c49e9
 eo e8d77731b6c5
 es-AR 7b3a55ba3c14
 es-CL 0d0f6ed3de15
-es-ES 7ee59ed89404
+es-ES 9b642fc4349f
 es-MX 8ff17539cf7a
 et b6531750bb95
 eu 55b770b673b7
 fa 6de9f1f1b879
 fi d75db5ed10a7
-fr 29573f8aad88
+fr 1aa0726a7da1
 fy-NL 0375a2af066e
 ga-IE 473d29266544
 gd cb529aa6189c
 gl e88c1d79c0ef
 gu-IN 0e8b1143cab8
 he 692d02ebdbda
 hi-IN 9aa4b8b60292
 hr be970cc84ac4
-hu e9df3966750d
-hy-AM b000f519f331
+hu 4f24c51ae997
+hy-AM da2d45458d84
 id 227656bbcf83
-is 500a2cc7079a
-it 9d23fb9b6fa9
+is 2bb70d993599
+it e48b3c67ddbb
 ja 8d0aef531e8e
 ja-JP-mac 9c57ec4caa45
 kk 455c0eebe9b8
 kn 632923b59090
 ko 229dd5b01b97
 ku 0228cb0337b6
 lg 8507778e7c9d
 lt 75fb5d4a86e9
 lv 3fbca2e4c7ce
 mai d9ee383188a0
-mk 97291f04cc80
+mk 41c35fad66dc
 ml 1241d7b9d3d9
 mr 2324d97d9d91
 nb-NO 54fae66fe6bb
 nl 9b2f644ccb38
 nn-NO dec0b6940d0d
 nso 8ca79272c245
 or 002ed51c7976
 pa-IN 9016fc2a64a2
-pl 44b6879408c3
+pl 34aef37031ec
 pt-BR 0a6290d2c8fd
 pt-PT e6fe93a03e67
 rm 86955047c0e2
 ro bc75baa4ce9f
-ru f39ed585c7ae
+ru 3691ff6ba8f2
 si 7cea4aba5e47
 sk 9383295be739
 sl 8eb7bad7dd95
 son 62769ddc0640
-sq 667420fa15b8
+sq ef12fbc88be8
 sr b8e0b8ae8d57
 sv-SE 5469f3940538
 ta 3dffefebe7b8
 ta-LK e234b8a53b55
 te 413c8a4fc489
 th fd2ebd35ee1d
 tr 737b5aaf1555
 uk 8563074f7aa9
--- a/mozilla/preproduction_config.py
+++ b/mozilla/preproduction_config.py
@@ -1,34 +1,37 @@
 MAC_SNOW_MINIS = ['moz2-darwin10-slave%02i' % x for x in range(1,30) + range(40,57)]
 MAC_MINIS      = ['moz2-darwin9-slave%02i' % x for x in range(1,4) + range(5,73)]
 XSERVES        = ['bm-xserve%02i' % x for x in [6,7,9,11,12,15,16,17,18,19,21,22]]
 WIN32_VMS      = ['win32-slave%02i' % x for x in range(1,61)]
-WIN32_IXS      = ['mw32-ix-slave%02i' % x for x in range(1,26)]
+WIN32_IXS      = ['mw32-ix-slave%02i' % x for x in range(1,26)] + ['w32-ix-slave%02i' % x for x in range(1,43)]
 LINUX_VMS      = ['moz2-linux-slave%02i' % x for x in range(1,61)]
-LINUX_IXS      = ['mv-moz2-linux-ix-slave%02i' % x for x in range(1,25)]
+LINUX_IXS      = ['mv-moz2-linux-ix-slave%02i' % x for x in range(1,24)] + ['linux-ix-slave%02i' % x for x in range(1,43)]
+LINUX64_VMS    = ['moz2-linux64-slave%02i' % x for x in range(1,13)]
+LINUX64_IXS    = ['linux64-ix-slave%02i' % x for x in range(1,22)]
 SLAVES = {
     'linux':       LINUX_VMS + LINUX_IXS,
-    'linux64':     ['moz2-linux64-slave%02i' % x for x in range(1,13)],
+    'linux64':     LINUX64_VMS + LINUX64_IXS,
     'win32':       WIN32_VMS + WIN32_IXS,
     'macosx':      MAC_MINIS + XSERVES,
-    'macosx64': MAC_SNOW_MINIS,
+    'macosx64':    MAC_SNOW_MINIS,
 }
 
 TRY_LINUX      = ['try-linux-slave%02i' % x for x in range (1,26)]
 TRY_LINUX_IXS  = []
 TRY_LINUX64    = ['try-linux64-slave%02i' % x for x in range (1,11)]
+TRY_LINUX64_IXS= ['linux64-ix-slave%02i' % x for x in range(22,41)]
 TRY_MAC        = ['try-mac-slave%02i' % x for x in range (1,48)]
 TRY_MAC64      = ['try-mac64-slave%02i' % x for x in range (1,32)]
 TRY_WIN32      = ['try-w32-slave%02i' % x for x in range (1,32)]
 TRY_WIN32_IXS  = []
 
 TRY_SLAVES = SLAVES
 TRY_SLAVES['linux'] += TRY_LINUX + TRY_LINUX_IXS
-TRY_SLAVES['linux64'] += TRY_LINUX64
+TRY_SLAVES['linux64'] += TRY_LINUX64 + TRY_LINUX64_IXS
 TRY_SLAVES['macosx'] += TRY_MAC
 TRY_SLAVES['macosx64'] += TRY_MAC64
 TRY_SLAVES['win32'] += TRY_WIN32 + TRY_WIN32_IXS
 
 
 GLOBAL_VARS = {
     'config_repo_path': 'users/prepr-ffxbld/buildbot-configs',
     'buildbotcustom_repo_path': 'users/prepr-ffxbld/buildbotcustom',
--- a/mozilla/production_builder_master_bm04_localconfig.py
+++ b/mozilla/production_builder_master_bm04_localconfig.py
@@ -1,20 +1,20 @@
 c = BuildmasterConfig = {}
-c['slavePortnum'] = 9010
+c['slavePortnum'] = 9001
 
 from buildbot.status.html import WebStatus
 c['status'] = [
-        WebStatus(http_port=8010, allowForce=True)
+        WebStatus(http_port=8001, allowForce=True)
 ]
 
-c['buildbotURL'] = 'http://buildbot-master4.build.mozilla.org:8010/'
+c['buildbotURL'] = 'http://buildbot-master04.build.mozilla.org:8001/'
 
 from buildbot import manhole
-c['manhole'] = manhole.PasswordManhole("tcp:1235:interface=127.0.0.1", "cltbld", "password")
+c['manhole'] = manhole.PasswordManhole("tcp:7001:interface=127.0.0.1", "cltbld", "password")
 
 from config import BRANCHES, SLAVES, PROJECTS, ACTIVE_PROJECT_BRANCHES
 ACTIVE_BRANCHES = ['shadow-central', 'mozilla-1.9.1', 'mozilla-1.9.2', 'mozilla-central',
         'mozilla-2.0', 'mozilla-2.1', 'mozilla-beta',
 ] + ACTIVE_PROJECT_BRANCHES
 ACTIVE_PROJECTS = PROJECTS.keys()
 ACTIVE_RELEASE_BRANCHES = []
 
--- a/mozilla/production_builder_master_bm06_localconfig.py
+++ b/mozilla/production_builder_master_bm06_localconfig.py
@@ -1,20 +1,20 @@
 c = BuildmasterConfig = {}
-c['slavePortnum'] = 9010
+c['slavePortnum'] = 9001
 
 from buildbot.status.html import WebStatus
 c['status'] = [
-        WebStatus(http_port=8010, allowForce=True)
+        WebStatus(http_port=8001, allowForce=True)
 ]
 
-c['buildbotURL'] = 'http://buildbot-master6.build.mozilla.org:8010/'
+c['buildbotURL'] = 'http://buildbot-master06.build.mozilla.org:8001/'
 
 from buildbot import manhole
-c['manhole'] = manhole.PasswordManhole("tcp:1235:interface=127.0.0.1", "cltbld", "password")
+c['manhole'] = manhole.PasswordManhole("tcp:7001:interface=127.0.0.1", "cltbld", "password")
 
 from config import BRANCHES, SLAVES, PROJECTS, ACTIVE_PROJECT_BRANCHES
 ACTIVE_BRANCHES = ['shadow-central', 'mozilla-1.9.1', 'mozilla-1.9.2', 'mozilla-central',
         'mozilla-2.0', 'mozilla-2.1', 'mozilla-beta',
 ] + ACTIVE_PROJECT_BRANCHES
 ACTIVE_PROJECTS = PROJECTS.keys()
 ACTIVE_RELEASE_BRANCHES = []
 
--- a/mozilla/production_try_builder_master_bm04_localconfig.py
+++ b/mozilla/production_try_builder_master_bm04_localconfig.py
@@ -1,20 +1,20 @@
 c = BuildmasterConfig = {}
-c['slavePortnum'] = 9012
+c['slavePortnum'] = 9101
 
 from buildbot.status.html import WebStatus
 c['status'] = [
-        WebStatus(http_port=8012, allowForce=True)
+        WebStatus(http_port=8101, allowForce=True)
 ]
 
-c['buildbotURL'] = 'http://buildbot-master4.build.mozilla.org:8012/'
+c['buildbotURL'] = 'http://buildbot-master04.build.mozilla.org:8101/'
 
 from buildbot import manhole
-c['manhole'] = manhole.PasswordManhole("tcp:1238:interface=127.0.0.1", "cltbld", "password")
+c['manhole'] = manhole.PasswordManhole("tcp:7101:interface=127.0.0.1", "cltbld", "password")
 
 from config import BRANCHES, TRY_SLAVES, PROJECTS
 ACTIVE_BRANCHES = ['tryserver']
 ACTIVE_RELEASE_BRANCHES = []
 # Override with TRY_SLAVES
 SLAVES = TRY_SLAVES
 
 # Don't do any projects
--- a/mozilla/production_try_builder_master_bm06_localconfig.py
+++ b/mozilla/production_try_builder_master_bm06_localconfig.py
@@ -1,20 +1,20 @@
 c = BuildmasterConfig = {}
-c['slavePortnum'] = 9012
+c['slavePortnum'] = 9101
 
 from buildbot.status.html import WebStatus
 c['status'] = [
-        WebStatus(http_port=8012, allowForce=True)
+        WebStatus(http_port=8101, allowForce=True)
 ]
 
-c['buildbotURL'] = 'http://buildbot-master6.build.mozilla.org:8012/'
+c['buildbotURL'] = 'http://buildbot-master06.build.mozilla.org:8101/'
 
 from buildbot import manhole
-c['manhole'] = manhole.PasswordManhole("tcp:1238:interface=127.0.0.1", "cltbld", "password")
+c['manhole'] = manhole.PasswordManhole("tcp:7101:interface=127.0.0.1", "cltbld", "password")
 
 from config import BRANCHES, TRY_SLAVES, PROJECTS
 ACTIVE_BRANCHES = ['tryserver']
 ACTIVE_RELEASE_BRANCHES = []
 # Override with TRY_SLAVES
 SLAVES = TRY_SLAVES
 
 # Don't do any projects
--- a/mozilla/project_branches.py
+++ b/mozilla/project_branches.py
@@ -52,20 +52,20 @@ PROJECT_BRANCHES = {
         'enable_talos': False,
         'enable_nightly': True,
         'create_snippet': True,
         'create_partial': True,
     },
     'mozilla-aurora': {
         'repo_path': 'mozilla-aurora',
         'mozconfig_dir': 'mozilla-aurora',
-        'aus2_base_upload_dir': '/opt/aus2/incoming/2/Firefox/mozilla-aurora-bug648066',
-        'aus2_base_upload_dir_l10n': '/opt/aus2/incoming/2/Firefox/mozilla-aurora-bug648066',
-        'aus2_mobile_base_upload_dir': '/opt/aus2/incoming/2/Fennec/mozilla-aurora-bug648066',
-        'aus2_mobile_base_upload_dir_l10n': '/opt/aus2/incoming/2/Fennec/mozilla-aurora-bug648066',
+        'aus2_base_upload_dir': '/opt/aus2/incoming/2/Firefox/mozilla-aurora',
+        'aus2_base_upload_dir_l10n': '/opt/aus2/incoming/2/Firefox/mozilla-aurora',
+        'aus2_mobile_base_upload_dir': '/opt/aus2/incoming/2/Fennec/mozilla-aurora',
+        'aus2_mobile_base_upload_dir_l10n': '/opt/aus2/incoming/2/Fennec/mozilla-aurora',
         'create_snippet': True,
         'create_partial': True,
         'create_partial_l10n': True,
         'create_mobile_snippet': True,
         'start_hour': [3],
         'start_minute': [32],
         'enable_nightly': True,
         'enable_mobile_nightly': True,
@@ -153,16 +153,19 @@ PROJECT_BRANCHES = {
             'remote-twinopen': 1,
         }
     },
     'holly': {},
     'larch': {},
     'maple': {},
 }
 
-# We want all for now, but can turn them off in here if necessary
+# All is the default
 ACTIVE_PROJECT_BRANCHES = PROJECT_BRANCHES.keys()
+# Turning off graphics - bug 649507
+for branch in ('graphics',):
+    ACTIVE_PROJECT_BRANCHES.remove(branch)
 
 # Load up project branches' local values
 for branch in PROJECT_BRANCHES.keys():
     PROJECT_BRANCHES[branch]['tinderbox_tree'] = branch.title()
     PROJECT_BRANCHES[branch]['mobile_tinderbox_tree'] = branch.title()
     PROJECT_BRANCHES[branch]['packaged_unittest_tinderbox_tree'] = branch.title()
--- a/mozilla/release-firefox-mozilla-2.0.py
+++ b/mozilla/release-firefox-mozilla-2.0.py
@@ -9,36 +9,36 @@ releaseConfig['messagePrefix']       = '
 
 # Basic product configuration
 #  Names for the product/files
 releaseConfig['productName']         = 'firefox'
 releaseConfig['appName']             = 'browser'
 releaseConfig['binaryName']          = releaseConfig['productName'].capitalize()
 releaseConfig['oldBinaryName']       = releaseConfig['binaryName']
 #  Current version info
-releaseConfig['version']             = '4.0rc2'
-releaseConfig['appVersion']          = '4.0'
-releaseConfig['milestone']           = '2.0'
-releaseConfig['buildNumber']         = 3
-releaseConfig['baseTag']             = 'FIREFOX_4_0rc2'
+releaseConfig['version']             = '4.0.1'
+releaseConfig['appVersion']          = releaseConfig['version']
+releaseConfig['milestone']           = '2.0.1'
+releaseConfig['buildNumber']         = 1
+releaseConfig['baseTag']             = 'FIREFOX_4_0_1'
 #  Old version info
-releaseConfig['oldVersion']          = '4.0rc1'
+releaseConfig['oldVersion']          = '4.0rc2'
 releaseConfig['oldAppVersion']       = '4.0'
-releaseConfig['oldBuildNumber']      = 1
-releaseConfig['oldBaseTag']          = 'FIREFOX_4_0rc1'
+releaseConfig['oldBuildNumber']      = 3
+releaseConfig['oldBaseTag']          = 'FIREFOX_4_0rc2'
 #  Next (nightly) version info
-releaseConfig['nextAppVersion']      = '4.0pre'
-releaseConfig['nextMilestone']       = '2.0pre'
+releaseConfig['nextAppVersion']      = '4.0.2pre'
+releaseConfig['nextMilestone']       = '2.0.2pre'
 #  Repository configuration, for tagging
 releaseConfig['sourceRepositories']  = {
     'mozilla': {
         'name': 'mozilla-2.0',
         'path': 'releases/mozilla-2.0',
-        'revision': '6be9e31d01b4',
-        'relbranch': 'GECKO20_2011031715_RELBRANCH',
+        'revision': 'fdfd2af3498e',
+        'relbranch': None,
         'bumpFiles': {
             'browser/config/version.txt': {
                 'version': releaseConfig['appVersion'],
                 'nextVersion': releaseConfig['nextAppVersion']
             },
             'config/milestone.txt': {
                 'version': releaseConfig['milestone'],
                 'nextVersion': releaseConfig['nextMilestone']
--- a/mozilla/staging_config.py
+++ b/mozilla/staging_config.py
@@ -7,17 +7,17 @@ LINUX_VMS      = ['moz2-linux-slave%02i'
 LINUX_IXS      = ['mv-moz2-linux-ix-slave%02i' % x for x in range(1,24)] + ['linux-ix-slave%02i' % x for x in range(1,43)]
 LINUX64_VMS    = ['moz2-linux64-slave%02i' % x for x in range(1,13)]
 LINUX64_IXS    = ['linux64-ix-slave%02i' % x for x in range(1,22)]
 SLAVES = {
     'linux':       LINUX_VMS + LINUX_IXS,
     'linux64':     LINUX64_VMS + LINUX64_IXS,
     'win32':       WIN32_VMS + WIN32_IXS,
     'macosx':      MAC_MINIS + XSERVES,
-    'macosx64': MAC_SNOW_MINIS,
+    'macosx64':    MAC_SNOW_MINIS,
 }
 
 TRY_LINUX      = ['try-linux-slave%02i' % x for x in range (1,26)]
 TRY_LINUX_IXS  = []
 TRY_LINUX64    = ['try-linux64-slave%02i' % x for x in range (1,11)]
 TRY_LINUX64_IXS= ['linux64-ix-slave%02i' % x for x in range(22,41)]
 TRY_MAC        = ['try-mac-slave%02i' % x for x in range (1,48)]
 TRY_MAC64      = ['try-mac64-slave%02i' % x for x in range (1,32)]
--- a/setup-master.py
+++ b/setup-master.py
@@ -270,17 +270,17 @@ mozilla_production_try_builder_master_bm
         local_links = [
             ('production_try_builder_master_bm03_localconfig.py', 'master_localconfig.py'),
             ('production_config.py', 'localconfig.py'),
             ('builder_master.cfg', 'master.cfg'),
             ]
         )
 
 mozilla_production_try_builder_master_bm04 = mozilla_base + MasterConfig(
-        "bm04-trybuilder",
+        "bm04-try1",
         local_links = [
             ('production_try_builder_master_bm04_localconfig.py', 'master_localconfig.py'),
             ('production_config.py', 'localconfig.py'),
             ('builder_master.cfg', 'master.cfg'),
             ]
         )
 
 mozilla_production_try_builder_master_bm05 = mozilla_base + MasterConfig(
@@ -288,17 +288,17 @@ mozilla_production_try_builder_master_bm
         local_links = [
             ('production_try_builder_master_bm05_localconfig.py', 'master_localconfig.py'),
             ('production_config.py', 'localconfig.py'),
             ('builder_master.cfg', 'master.cfg'),
             ]
         )
 
 mozilla_production_try_builder_master_bm06 = mozilla_base + MasterConfig(
-        "bm06-trybuilder",
+        "bm06-try1",
         local_links = [
             ('production_try_builder_master_bm06_localconfig.py', 'master_localconfig.py'),
             ('production_config.py', 'localconfig.py'),
             ('builder_master.cfg', 'master.cfg'),
             ]
         )
 
 mozilla_production_builder_master_pm03 = mozilla_production + MasterConfig(
@@ -324,17 +324,17 @@ mozilla_production_builder_master_bm02 =
         local_links = [
             ('production_builder_master_bm02_localconfig.py', 'master_localconfig.py'),
             ('production_config.py', 'localconfig.py'),
             ('builder_master.cfg', 'master.cfg'),
             ]
         )
 
 mozilla_production_builder_master_bm04 = mozilla_base + MasterConfig(
-        "bm04-builder",
+        "bm04-build1",
         local_links = [
             ('production_builder_master_bm04_localconfig.py', 'master_localconfig.py'),
             ('production_config.py', 'localconfig.py'),
             ('builder_master.cfg', 'master.cfg'),
             ]
         )
 
 mozilla_production_builder_master_bm05 = mozilla_base + MasterConfig(
@@ -342,17 +342,17 @@ mozilla_production_builder_master_bm05 =
         local_links = [
             ('production_builder_master_bm05_localconfig.py', 'master_localconfig.py'),
             ('production_config.py', 'localconfig.py'),
             ('builder_master.cfg', 'master.cfg'),
             ]
         )
 
 mozilla_production_builder_master_bm06 = mozilla_base + MasterConfig(
-        "bm06-builder",
+        "bm06-build1",
         local_links = [
             ('production_builder_master_bm06_localconfig.py', 'master_localconfig.py'),
             ('production_config.py', 'localconfig.py'),
             ('builder_master.cfg', 'master.cfg'),
             ]
         )
 
 mozilla_tests = MasterConfig(
@@ -413,25 +413,16 @@ mozilla_production_tests_scheduler_maste
         "pm02-tests_scheduler",
         local_links = [
             ('production_tests_scheduler_master_pm02_localconfig.py', 'master_localconfig.py'),
             ('production_config.py', 'localconfig.py'),
             ('scheduler_master.cfg', 'master.cfg'),
             ]
         )
 
-mozilla_production_tests_master_talos_master02 = mozilla_tests + MasterConfig(
-        "talos-master02-tests_master",
-        local_links = [
-            ('production_tests_master_talos-master02_localconfig.py', 'master_localconfig.py'),
-            ('production_config.py', 'localconfig.py'),
-            ('tests_master.cfg', 'master.cfg'),
-            ]
-        )
-
 mozilla_production_tests_master_tm01 = mozilla_tests + MasterConfig(
         "tm01-tests_master",
         local_links = [
             ('production_tests_master_tm01_localconfig.py', 'master_localconfig.py'),
             ('production_config.py', 'localconfig.py'),
             ('tests_master.cfg', 'master.cfg'),
             ]
         )
@@ -459,17 +450,17 @@ mozilla_production_tests_master_bm02_2 =
         local_links = [
             ('production_tests_master_bm02_2_localconfig.py', 'master_localconfig.py'),
             ('production_config.py', 'localconfig.py'),
             ('tests_master.cfg', 'master.cfg'),
             ]
         )
 
 mozilla_production_tests_master_bm04 = mozilla_tests + MasterConfig(
-        "bm04-tests_master",
+        "bm04-tests1",
         local_links = [
             ('production_tests_master_bm04_localconfig.py', 'master_localconfig.py'),
             ('production_config.py', 'localconfig.py'),
             ('tests_master.cfg', 'master.cfg'),
             ]
         )
 
 mozilla_production_tests_master_bm05 = mozilla_tests + MasterConfig(
@@ -477,17 +468,17 @@ mozilla_production_tests_master_bm05 = m
         local_links = [
             ('production_tests_master_bm05_localconfig.py', 'master_localconfig.py'),
             ('production_config.py', 'localconfig.py'),
             ('tests_master.cfg', 'master.cfg'),
             ]
         )
 
 mozilla_production_tests_master_bm06 = mozilla_tests + MasterConfig(
-        "bm06-tests_master",
+        "bm06-tests1",
         local_links = [
             ('production_tests_master_bm06_localconfig.py', 'master_localconfig.py'),
             ('production_config.py', 'localconfig.py'),
             ('tests_master.cfg', 'master.cfg'),
             ]
         )
 
 mozilla_preproduction_scheduler_master = mozilla_production + MasterConfig(
@@ -549,17 +540,16 @@ masters_080 = [
 
         # Test masters
         mozilla_staging_tests_scheduler_master,
         mozilla_staging_tests_master1,
         mozilla_staging_tests_master2,
         mozilla_preproduction_tests_scheduler_master,
         mozilla_preproduction_tests_master,
         mozilla_production_tests_scheduler_master,
-        mozilla_production_tests_master_talos_master02,
         mozilla_production_tests_master_tm01,
         mozilla_production_tests_master_bm01_2,
         mozilla_production_tests_master_bm02_1,
         mozilla_production_tests_master_bm02_2,
         mozilla_production_tests_master_bm04,
         mozilla_production_tests_master_bm05,
         mozilla_production_tests_master_bm06,
 
--- a/thunderbird/config.py
+++ b/thunderbird/config.py
@@ -29,19 +29,19 @@ branch_configs = {
     },
     'comm-1.9.2': {
         'branch_name': 'comm-1.9.2',
         'platforms': ['linux', 'linux64', 'macosx', 'win32'],
     },
 }
 
 linux_slaves            = [ 'momo-vm-linux-%02i' % x for x in [2,3,4,5,6,7,8,9,11,12,13,14,15,16]]
-linux_unittest_slaves   = [ 'momo-vm-fedora12-%02i' % x for x in [2,3,4]]
+linux_unittest_slaves   = [ 'momo-vm-fedora12-%02i' % x for x in [2,3,4,5]]
 linux64_slaves          = [ 'momo-vm-linux64-%02i' % x for x in [ 2,3,5,6,7,8,9,10 ]]
-linux64_unittest_slaves = [ 'momo-vm-fedora12-64-%02i' % x for x in [ 2,3,4 ]]
+linux64_unittest_slaves = [ 'momo-vm-fedora12-64-%02i' % x for x in [ 2,3,4,5 ]]
 win32_slaves            = [ 'momo-vm-win2k3-%02i' % x for x in [ 1,2,4,5,6,8,9,10,11,12,13,14,15,17 ] ]
 macosx_slaves           = [ 'mini-%02i' % x for x in [ 3,4,5,6,7,8,9 ] ]
 macosx64_slaves         = [ 'momo-xserve-01'] + [ 'mini64-%02i' % x for x in [ 1,3,4,5,6 ] ]
 macosx64_unittest_slaves = [ 'mini64-%02i' % x for x in [ 1,3,4,5,6 ] ]
 
 
 platforms = {
     'linux': {
--- a/thunderbird/macosx64/comm-central/nightly/mozconfig
+++ b/thunderbird/macosx64/comm-central/nightly/mozconfig
@@ -1,11 +1,18 @@
 if test -e "$topsrcdir/mozilla/build/macosx/universal/mozconfig"; then
   oldtopsrcdir=$topsrcdir
   export topsrcdir=$topsrcdir/mozilla
+else
+  # Big Hack that unsets CC / CXX so that mozconfig.common doesn't get
+  # mixed up with host/target CPUs when trying to work out how to do the
+  # universal build. When we redo the build system (bug 648979) this will
+  # go away.
+  unset CC
+  unset CXX
 fi
 
 . $topsrcdir/build/macosx/universal/mozconfig
 
 if test -n $oldtopsrcdir; then
   export topsrcdir=$oldtopsrcdir
 fi