Bug 913197 - create comm-esr24 branch. r=jhopkins
authorRail Aliiev <rail@mozilla.com>
Fri, 06 Sep 2013 11:47:16 -0400
changeset 9056 95b7da1362c7b9d1cf5df7819955a63fb9ca64f1
parent 9055 03c42dc132b64affba62300819aef6fe1be05893
child 9057 e14e02c12081068027108240b00e0e51d5d61ecc
child 9058 138a4e16b48c84cb4736dd4d3f5fb27e66251c2a
push id6792
push userraliiev@mozilla.com
push dateFri, 06 Sep 2013 15:47:37 +0000
reviewersjhopkins
bugs913197
Bug 913197 - create comm-esr24 branch. r=jhopkins
mozilla/thunderbird_config.py
--- a/mozilla/thunderbird_config.py
+++ b/mozilla/thunderbird_config.py
@@ -610,27 +610,16 @@ PLATFORM_VARS = {
 BRANCHES = {
     'comm-central': {
     },
     'comm-aurora': {
     },
     'comm-beta': {
     },
     'comm-release': {
-        'lock_platforms': True,
-        'platforms': {
-            'linux': {},
-            'linux64': {},
-            'win32': {},
-            'macosx64': {},
-            'linux-debug': {},
-            'linux64-debug': {},
-            'macosx64-debug': {},
-            'win32-debug': {},
-        },
     },
     'comm-esr17': {
         'lock_platforms': True,
         'platforms': {
             'linux': {},
             'linux64': {},
             'win32': {},
             'macosx64': {},
@@ -743,29 +732,30 @@ BRANCHES['comm-central']['aus2_base_uplo
 BRANCHES['comm-central']['enable_blocklist_update'] = True
 BRANCHES['comm-central']['blocklist_update_on_closed_tree'] = False
 BRANCHES['comm-central']['platforms']['linux']['nightly_signing_servers'] = 'nightly-signing'
 BRANCHES['comm-central']['platforms']['linux64']['nightly_signing_servers'] = 'nightly-signing'
 BRANCHES['comm-central']['platforms']['win32']['nightly_signing_servers'] = 'nightly-signing'
 BRANCHES['comm-central']['platforms']['macosx64']['nightly_signing_servers'] = 'mac-nightly-signing'
 
 ######## comm-release
-BRANCHES['comm-release']['repo_path'] = 'releases/comm-esr17'
-BRANCHES['comm-release']['moz_repo_path'] = 'releases/mozilla-esr17'
+BRANCHES['comm-release']['repo_path'] = 'releases/comm-esr24'
+BRANCHES['comm-release']['moz_repo_path'] = 'releases/mozilla-esr24'
 BRANCHES['comm-release']['update_channel'] = 'release'
 BRANCHES['comm-release']['mozilla_dir'] = 'mozilla'
 BRANCHES['comm-release']['skip_blank_repos'] = True
 BRANCHES['comm-release']['call_client_py'] = True
-BRANCHES['comm-release']['l10n_repo_path'] = 'releases/l10n/mozilla-esr17'
+BRANCHES['comm-release']['l10n_repo_path'] = 'releases/l10n/mozilla-esr24'
 BRANCHES['comm-release']['enable_weekly_bundle'] = True
 BRANCHES['comm-release']['start_hour'] = [3]
 BRANCHES['comm-release']['start_minute'] = [2]
 BRANCHES['comm-release']['enable_xulrunner'] = False
 # Enable unit tests
 BRANCHES['comm-release']['enable_mac_a11y'] = True
+BRANCHES['comm-release']['unittest_build_space'] = 6
 # L10n configuration
 BRANCHES['comm-release']['enable_l10n'] = False
 BRANCHES['comm-release']['enable_l10n_onchange'] = False
 BRANCHES['comm-release']['l10nNightlyUpdate'] = False
 BRANCHES['comm-release']['l10n_platforms'] = ['linux', 'linux64', 'win32',
                                               'macosx64']
 BRANCHES['comm-release']['l10nDatedDirs'] = True
 BRANCHES['comm-release']['l10n_tree'] = 'tbrel'
@@ -774,36 +764,16 @@ BRANCHES['comm-release']['enUS_binaryURL
 BRANCHES['comm-release']['allLocalesFile'] = 'mail/locales/all-locales'
 BRANCHES['comm-release']['localesURL'] = \
     '%s/build/buildbot-configs/raw-file/production/mozilla/l10n/all-locales.comm-release' % (GLOBAL_VARS['hgurl'])
 # temp disable nightlies (which includes turning off enable_l10n and l10nNightlyUpdate)
 BRANCHES['comm-release']['enable_nightly'] = False
 BRANCHES['comm-release']['enable_blocklist_update'] = False
 BRANCHES['comm-release']['blocklist_update_on_closed_tree'] = False
 BRANCHES['comm-release']['enable_valgrind'] = False
-# mock disabled block start
-# linux platforms
-BRANCHES['comm-release']['platforms']['linux']['use_mock'] = False
-BRANCHES['comm-release']['platforms']['linux64']['use_mock'] = False
-BRANCHES['comm-release']['platforms']['linux-debug']['use_mock'] = False
-BRANCHES['comm-release']['platforms']['linux64-debug']['use_mock'] = False
-BRANCHES['comm-release']['platforms']['linux']['slaves'] = SLAVES['linux']
-BRANCHES['comm-release']['platforms']['linux64']['slaves'] = SLAVES['linux64']
-BRANCHES['comm-release']['platforms']['linux-debug']['slaves'] = SLAVES['linux']
-BRANCHES['comm-release']['platforms']['linux64-debug']['slaves'] = SLAVES['linux64']
-BRANCHES['comm-release']['platforms']['linux']['env']['PYTHON26'] = '/tools/python-2.6.5/bin/python'
-BRANCHES['comm-release']['platforms']['linux64']['env']['PYTHON26'] = '/tools/python-2.6.5/bin/python'
-BRANCHES['comm-release']['platforms']['linux']['env']['SYMBOL_SERVER_SSH_KEY'] = '/home/cltbld/.ssh/tbirdbld_dsa'
-BRANCHES['comm-release']['platforms']['linux64']['env']['SYMBOL_SERVER_SSH_KEY'] = '/home/cltbld/.ssh/tbirdbld_dsa'
-del BRANCHES['comm-release']['platforms']['linux']['env']['PATH']
-del BRANCHES['comm-release']['platforms']['linux64']['env']['PATH']
-del BRANCHES['comm-release']['platforms']['linux-debug']['env']['PATH']
-del BRANCHES['comm-release']['platforms']['linux64-debug']['env']['PATH']
-# mock disabled block stop
-BRANCHES['comm-release']['platforms']['win32']['l10n_slaves'] = SLAVES['win32']
 
 ######## comm-esr17
 BRANCHES['comm-esr17']['moz_repo_path'] = 'releases/mozilla-esr17'
 BRANCHES['comm-esr17']['repo_path'] = 'releases/comm-esr17'
 BRANCHES['comm-esr17']['l10n_repo_path'] = 'releases/l10n/mozilla-release'
 BRANCHES['comm-esr17']['update_channel'] = 'nightly-esr17'
 BRANCHES['comm-esr17']['mozilla_dir'] = 'mozilla'
 BRANCHES['comm-esr17']['skip_blank_repos'] = True
@@ -888,17 +858,16 @@ BRANCHES['comm-beta']['l10n_tree'] = 'tb
 #make sure it has an ending slash
 BRANCHES['comm-beta']['l10nUploadPath'] = \
     '/home/ftp/pub/mozilla.org/thunderbird/nightly/latest-comm-beta-l10n/'
 BRANCHES['comm-beta']['enUS_binaryURL'] = \
     GLOBAL_VARS['download_base_url'] + '/nightly/latest-comm-beta'
 BRANCHES['comm-beta']['allLocalesFile'] = 'mail/locales/all-locales'
 BRANCHES['comm-beta']['localesURL'] = \
     '%s/build/buildbot-configs/raw-file/production/mozilla/l10n/all-locales.comm-beta' % (GLOBAL_VARS['hgurl'])
-BRANCHES['comm-beta']['enable_multi_locale'] = True
 # temp disable nightlies (which includes turning off enable_l10n and l10nNightlyUpdate)
 BRANCHES['comm-beta']['enable_nightly'] = False
 # If True, a complete update snippet for this branch will be generated and
 # uploaded to. Any platforms with 'debug' in them will not have snippets
 # generated.
 BRANCHES['comm-beta']['enable_blocklist_update'] = True
 BRANCHES['comm-beta']['blocklist_update_on_closed_tree'] = False
 BRANCHES['comm-beta']['enable_valgrind'] = False
@@ -1022,34 +991,34 @@ for branch in branches:
     if BRANCHES[branch]['platforms'].has_key('linux64-debug'):
         BRANCHES[branch]['platforms']['linux64-debug']['env']['LD_LIBRARY_PATH'] ='/tools/gcc-4.3.3/installed/lib64:%s/mozilla/dist/bin' % OBJDIR
         BRANCHES[branch]['platforms']['linux64-debug']['unittest-env'] = {
             'LD_LIBRARY_PATH': '/tools/gcc-4.3.3/installed/lib64',
         }
 
 # MERGE DAY
 # When Thunderbird 18 merges into these branches, they can be removed from the list
-for b in ('comm-esr17', 'comm-release'):
+for b in ['comm-esr17']:
     # Disable pymake
     for p in ('win32', 'win32-debug', 'win64'):
         if p not in BRANCHES[b]['platforms']:
             continue
         BRANCHES[b]['platforms'][p]['enable_pymake'] = False
 
 # MERGE DAY - pulseaudio-libs-devel package rides the trains (bug 662417)
 # MERGE DAY - when FF21 reaches them remove them from this list
-for b in ['comm-release', 'comm-esr17']:
+for b in ['comm-esr17']:
     for p, pc in BRANCHES[b]['platforms'].items():
         if 'mock_packages' in pc:
             BRANCHES[b]['platforms'][p]['mock_packages'] = \
                 [x for x in BRANCHES[b]['platforms'][p]['mock_packages'] if x != 'pulseaudio-libs-devel']
 
 # MERGE DAY building 32-bit linux in a x86_64 env rides the trains
 # MERGE DAY remove branches from this list when gecko 24 merges into them.
-for branch in ("comm-release", "comm-esr17"):
+for branch in ["comm-esr17"]:
     for platform in ['linux', 'linux-debug']:
         BRANCHES[branch]['platforms'][platform]['mock_target'] = \
             'mozilla-centos6-i386'
         BRANCHES[branch]['platforms'][platform]['mock_packages'] = \
             ['autoconf213', 'python', 'zip', 'mozilla-python27-mercurial',
              'git', 'ccache', 'glibc-static', 'libstdc++-static',
              'perl-Test-Simple', 'perl-Config-General',
              'gtk2-devel', 'libnotify-devel', 'yasm',
@@ -1066,17 +1035,17 @@ for branch in ("comm-release", "comm-esr
              'freetype-devel-2.3.11-6.el6_2.9',
             ]
         if not platform.endswith("-debug"):
             BRANCHES[branch]["platforms"][platform]["mock_packages"] += \
                 ["valgrind"]
 
 # MERGE DAY - gstreamer-devel packages ride the trains (bug 881589)
 # MERGE DAY - remove branches from this list when gecko 24 merges into them.
-for b in ("comm-release", "comm-esr17"):
+for b in ["comm-esr17"]:
     for p, pc in BRANCHES[b]['platforms'].items():
         if 'mock_packages' in pc:
             BRANCHES[b]['platforms'][p]['mock_packages'] = \
                 [x for x in BRANCHES[b]['platforms'][p]['mock_packages'] if x not in (
                     'gstreamer-devel', 'gstreamer-plugins-base-devel',
                     'gstreamer-devel.i686', 'gstreamer-plugins-base-devel.i686',
                 )]