Merge bugs 616320, 616583, and 615097 from default branch production
authorBen Hearsum <bhearsum@mozilla.com>
Mon, 06 Dec 2010 12:52:10 -0500
branchproduction
changeset 3355 e5262b6572a35d945c7be62ea9ab092c3cb34a84
parent 3351 bbc5266cfb2061005ace9053f5ac5346a66c8828 (current diff)
parent 3354 fc3a0690fad532a88790c39d730e252f540d98d0 (diff)
child 3358 27c879cf082ee956ec3a8a39094bb3e1335602bc
push id2645
push userbhearsum@mozilla.com
push dateMon, 06 Dec 2010 17:55:07 +0000
bugs616320, 616583, 615097
Merge bugs 616320, 616583, and 615097 from default branch
--- a/mozilla/builder_master.cfg
+++ b/mozilla/builder_master.cfg
@@ -93,17 +93,17 @@ def prioritizeBuilders(botmaster, builde
             # run next), so flip the sign of the priority so that higher
             # priorities sort to the front
             req_priority = -builds[0].priority
             submitted_at = builds[0].submittedAt
         else:
             req_priority = 0
             submitted_at = None
 
-        if builder.builder_status.category == 'release':
+        if builder.builder_status.category.startswith('release'):
             priority = 0
         else:
             priority = 1
 
         return priority, req_priority, submitted_at
     builders.sort(key=sortkey)
     return builders
 c['prioritizeBuilders'] = prioritizeBuilders
--- a/mozilla/config.py
+++ b/mozilla/config.py
@@ -1,16 +1,10 @@
 from copy import deepcopy
 
-try:
-    from buildbot.process.properties import WithProperties
-except ImportError:
-    def WithProperties(fmtstring, *args):
-        return fmtstring
-
 import localconfig
 reload(localconfig)
 from localconfig import MAC_SNOW_MINIS, MAC_MINIS, XSERVES, LINUX_VMS, \
                         LINUX_IXS, WIN32_VMS, WIN32_IXS, SLAVES, \
                         TRY_SLAVES
 
 GLOBAL_VARS = {
     # It's a little unfortunate to have both of these but some things (HgPoller)
@@ -335,17 +329,16 @@ PLATFORM_VARS = {
                 'MOZ_OBJDIR': OBJDIR,
                 'SYMBOL_SERVER_HOST': localconfig.SYMBOL_SERVER_HOST,
                 'SYMBOL_SERVER_USER': 'ffxbld',
                 'SYMBOL_SERVER_PATH': SYMBOL_SERVER_PATH,
                 'SYMBOL_SERVER_SSH_KEY': "/home/cltbld/.ssh/ffxbld_dsa",
                 'TINDERBOX_OUTPUT': '1',
                 'MOZ_CRASHREPORTER_NO_REPORT': '1',
                 'CCACHE_DIR': '/builds/ccache',
-                'CCACHE_BASEDIR': WithProperties('%(basedir:-)s'),
                 'CCACHE_COMPRESS': '1',
                 'CCACHE_UMASK': '002',
                 'LC_ALL': 'C',
             },
             'enable_opt_unittests': False,
             'enable_checktests': True,
             'talos_masters': GLOBAL_VARS['talos_masters'],
         },
@@ -370,17 +363,16 @@ PLATFORM_VARS = {
                 'SYMBOL_SERVER_PATH': SYMBOL_SERVER_PATH,
                 'SYMBOL_SERVER_SSH_KEY': "/home/cltbld/.ssh/ffxbld_dsa",
                 'MOZ_SYMBOLS_EXTRA_BUILDID': 'linux64',
                 'TINDERBOX_OUTPUT': '1',
                 'MOZ_CRASHREPORTER_NO_REPORT': '1',
                 'CCACHE_DIR': '/builds/ccache',
                 'CCACHE_COMPRESS': '1',
                 'CCACHE_UMASK': '002',
-                'CCACHE_BASEDIR': WithProperties('%(basedir:-)s'),
                 'LC_ALL': 'C',
             },
             'enable_opt_unittests': False,
             'enable_checktests': True,
             'talos_masters': GLOBAL_VARS['talos_masters'],
         },
         'macosx': {
             'base_name': 'OS X 10.5.2 %(branch)s',
@@ -484,17 +476,16 @@ PLATFORM_VARS = {
             'env': {
                 'MOZ_OBJDIR': OBJDIR,
                 'HG_SHARE_BASE_DIR': '/builds/hg-shared',
                 'DISPLAY': ':2',
                 'LD_LIBRARY_PATH': '%s/dist/bin' % OBJDIR,
                 'XPCOM_DEBUG_BREAK': 'stack-and-abort',
                 'MOZ_CRASHREPORTER_NO_REPORT': '1',
                 'CCACHE_DIR': '/builds/ccache',
-                'CCACHE_BASEDIR': WithProperties('%(basedir:-)s'),
                 'CCACHE_COMPRESS': '1',
                 'CCACHE_UMASK': '002',
                 'LC_ALL': 'C',
             },
             'enable_unittests': False,
             'enable_checktests': True,
             'talos_masters': GLOBAL_VARS['talos_masters'],
         },
@@ -512,17 +503,16 @@ PLATFORM_VARS = {
             'env': {
                 'MOZ_OBJDIR': OBJDIR,
                 'HG_SHARE_BASE_DIR': '/builds/hg-shared',
                 'DISPLAY': ':2',
                 'LD_LIBRARY_PATH': '%s/dist/bin' % OBJDIR,
                 'XPCOM_DEBUG_BREAK': 'stack-and-abort',
                 'MOZ_CRASHREPORTER_NO_REPORT': '1',
                 'CCACHE_DIR': '/builds/ccache',
-                'CCACHE_BASEDIR': WithProperties('%(basedir:-)s'),
                 'CCACHE_COMPRESS': '1',
                 'CCACHE_UMASK': '002',
                 'LC_ALL': 'C',
             },
             'enable_unittests': False,
             'enable_checktests': True,
             'talos_masters': GLOBAL_VARS['talos_masters'],
         },
@@ -995,17 +985,17 @@ BRANCHES['tracemonkey']['aus2_ssh_key'] 
 BRANCHES['tracemonkey']['aus2_base_upload_dir'] = '/opt/aus2/incoming/2/Firefox/tracemonkey'
 BRANCHES['tracemonkey']['aus2_base_upload_dir_l10n'] = '/opt/aus2/incoming/2/Firefox/tracemonkey'
 
 ######## places
 BRANCHES['places']['repo_path'] = 'projects/places'
 BRANCHES['places']['start_hour'] = [4]
 BRANCHES['places']['start_minute'] = [2]
 BRANCHES['places']['create_snippet'] = False
-BRANCHES['places']['enable_nightly'] = False
+BRANCHES['places']['enable_nightly'] = True
 # Disable XULRunner / SDK builds
 BRANCHES['places']['enable_xulrunner'] = False
 BRANCHES['places']['enable_mac_a11y'] = True
 BRANCHES['places']['unittest_build_space'] = 6
 # L10n configuration
 BRANCHES['places']['enable_l10n'] = False
 BRANCHES['places']['enable_l10n_onchange'] = False
 # need this or the master.cfg will bail