Bug 1015942 - tracking bug for build and release of thunderbird 31.0. r=nthomas
authorRail Aliiev <rail@mozilla.com>
Mon, 14 Jul 2014 13:42:02 -0400
changeset 10648 9f0b1c0867693179c94f813cee05e0defc993d17
parent 10647 d3b916ef173dda14dc205ad71723512c26c8d615
child 10649 561f13274c6e37859111d0c2f167e53a14145399
push id1
push userroot
push dateWed, 17 Dec 2014 00:18:48 +0000
reviewersnthomas
bugs1015942
Bug 1015942 - tracking bug for build and release of thunderbird 31.0. r=nthomas
dev-master_config.json.in
mozilla-tests/thunderbird_config.py
mozilla-tests/thunderbird_production_config.py
mozilla/build_localconfig.py
mozilla/l10n/all-locales.comm-esr24
mozilla/l10n/all-locales.comm-esr31
mozilla/master_common.py
mozilla/release-thunderbird-comm-esr24.py
mozilla/release-thunderbird-comm-esr24.py.template
mozilla/release-thunderbird-comm-esr31.py
mozilla/release-thunderbird-comm-esr31.py.template
mozilla/staging_release-thunderbird-comm-esr24.py
mozilla/staging_release-thunderbird-comm-esr24.py.template
mozilla/staging_release-thunderbird-comm-esr31.py
mozilla/staging_release-thunderbird-comm-esr31.py.template
mozilla/thunderbird_config.py
mozilla/thunderbird_preproduction_config.py
mozilla/thunderbird_production_config.py
mozilla/thunderbird_staging_config.py
mozilla2/linux/comm-esr24/release/mozconfig
mozilla2/linux/comm-esr31/release/mozconfig
--- a/dev-master_config.json.in
+++ b/dev-master_config.json.in
@@ -13,16 +13,16 @@
   "db_name": "dev-master1.srv.releng.scl3.mozilla.com:@BASEDIR@/master",
   "enabled": true,
   "environment": "staging",
   "hostname": "dev-master1.srv.releng.scl3.mozilla.com",
   "http_port": @HTTP_PORT@,
   "master_dir": "@BASEDIR@/master",
   "release_branches": ["mozilla-release", "mozilla-beta"],
   "mobile_release_branches": ["mozilla-release", "mozilla-beta"],
-  "thunderbird_release_branches": ["comm-beta", "comm-esr24"],
+  "thunderbird_release_branches": ["comm-beta", "comm-esr31"],
   "name": "@MASTER_NAME@",
   "pb_port": @PB_PORT@,
   "role": "@ROLE@",
   "ssh_port": @SSH_PORT@,
   "tools_branch": "@TOOLS_BRANCH@",
   "tools_dir": "@BASEDIR@/tools"
 }]
--- a/mozilla-tests/thunderbird_config.py
+++ b/mozilla-tests/thunderbird_config.py
@@ -22,18 +22,18 @@ GLOBAL_VARS.update(thunderbird_localconf
 
 BRANCHES = {
     'comm-central': {
     },
     'comm-beta': {
     },
     'comm-aurora': {
     },
-    'comm-esr24': {
-        'gecko_version': 24
+    'comm-esr31': {
+        'gecko_version': 31
     },
     'try-comm-central': {
         'coallesce_jobs': False
     },
 }
 
 setMainCommVersions(BRANCHES)
 
@@ -294,19 +294,19 @@ BRANCHES['comm-central']['pgo_strategy']
 ######## comm-beta
 BRANCHES['comm-beta']['pgo_strategy'] = None
 BRANCHES['comm-beta']['repo_path'] = "releases/comm-beta"
 
 ######## comm-aurora
 BRANCHES['comm-aurora']['pgo_strategy'] = None
 BRANCHES['comm-aurora']['repo_path'] = "releases/comm-aurora"
 
-######## comm-esr24
-BRANCHES['comm-esr24']['pgo_strategy'] = None
-BRANCHES['comm-esr24']['repo_path'] = "releases/comm-esr24"
+######## comm-esr31
+BRANCHES['comm-esr31']['pgo_strategy'] = None
+BRANCHES['comm-esr31']['repo_path'] = "releases/comm-esr31"
 
 ######## try
 BRANCHES['try-comm-central']['enable_try'] = True
 
 # Disable Rev3 winxp and win7 machines for all branches
 for branch in set(BRANCHES.keys()):
     if 'win32' not in BRANCHES[branch]['platforms']:
         continue
--- a/mozilla-tests/thunderbird_production_config.py
+++ b/mozilla-tests/thunderbird_production_config.py
@@ -10,18 +10,18 @@ GLOBAL_VARS['disable_tinderbox_mail'] = 
 GLOBAL_VARS['stage_username'] = 'tbirdbld'
 GLOBAL_VARS['stage_ssh_key'] = 'tbirdbld_dsa'
 
 # Local branch overrides
 BRANCHES = {
     'comm-central': {
         'tinderbox_tree': 'Thunderbird',
     },
-    'comm-esr24': {
-        'tinderbox_tree': 'Thunderbird-Esr24',
+    'comm-esr31': {
+        'tinderbox_tree': 'Thunderbird-Esr31',
     },
     'comm-beta': {
         'tinderbox_tree': 'Thunderbird-Beta',
     },
     'comm-aurora': {
         'tinderbox_tree': 'Thunderbird-Aurora',
     },
     'try-comm-central': {
--- a/mozilla/build_localconfig.py
+++ b/mozilla/build_localconfig.py
@@ -39,17 +39,17 @@ else:
 if 'limit_tb_branches' in master_config:
     ACTIVE_THUNDERBIRD_BRANCHES = [x.encode("utf-8") for x in master_config['limit_tb_branches']]
 else:
     ACTIVE_THUNDERBIRD_BRANCHES = ACTIVE_THUNDERBIRD_PROJECT_BRANCHES[:]
     ACTIVE_THUNDERBIRD_BRANCHES.extend([
         'comm-central',
         'comm-beta',
         'comm-aurora',
-        'comm-esr24',
+        'comm-esr31',
     ])
 if 'limit_b2g_branches' in master_config:
     ACTIVE_B2G_BRANCHES = [x.encode("utf-8") for x in master_config['limit_b2g_branches']]
 else:
     ACTIVE_B2G_BRANCHES = ACTIVE_B2G_PROJECT_BRANCHES[:]
     ACTIVE_B2G_BRANCHES.extend([
         'mozilla-central',
         'mozilla-aurora',
rename from mozilla/l10n/all-locales.comm-esr24
rename to mozilla/l10n/all-locales.comm-esr31
--- a/mozilla/master_common.py
+++ b/mozilla/master_common.py
@@ -17,17 +17,16 @@ c['builders'] = []
 c['schedulers'] = []
 c['change_source'] = []
 
 # Builders from these branches are given custom priority, default is 4 for unlisted branches
 # Please leave in sorted order
 DEFAULT_BRANCH_PRIORITY = 4
 BRANCH_PRIORITIES = {
     'mozilla-release': 0,
-    'comm-esr24': 0,
     'comm-esr31': 0,
     'mozilla-esr24': 1,
     'mozilla-esr31': 1,
     'mozilla-b2g28_v1_3': 1,
     'mozilla-beta': 2,
     'comm-beta': 2,
     'mozilla-central': 3,
     'comm-central': 3,
rename from mozilla/release-thunderbird-comm-esr24.py
rename to mozilla/release-thunderbird-comm-esr31.py
rename from mozilla/release-thunderbird-comm-esr24.py.template
rename to mozilla/release-thunderbird-comm-esr31.py.template
--- a/mozilla/release-thunderbird-comm-esr24.py.template
+++ b/mozilla/release-thunderbird-comm-esr31.py.template
@@ -36,49 +36,44 @@ releaseConfig['partialUpdates']      = {
 {% endfor %}
 }
 #  Next (nightly) version info
 releaseConfig['nextAppVersion']      = releaseConfig['appVersion']
 releaseConfig['nextMilestone']       = releaseConfig['milestone']
 #  Repository configuration, for tagging
 releaseConfig['sourceRepositories']  = {
     'comm': {
-        'name': 'comm-esr24',
-        'path': 'releases/comm-esr24',
+        'name': 'comm-esr34',
+        'path': 'releases/comm-esr31',
         'revision': '{{ commRevision }}',
         'relbranch': {% if commRelbranch %}'{{ commRelbranch }}'{% else %}None{% endif %},
         'bumpFiles': {
             'mail/config/version.txt': {
                 'version': releaseConfig['appVersion'],
                 'nextVersion': releaseConfig['nextAppVersion']
             },
         }
     },
     'mozilla': {
-        # XXX remove js/src/config/milestone.txt when setting up ESR31
-        'name': 'mozilla-esr24',
-        'path': 'releases/mozilla-esr24',
+        'name': 'mozilla-esr31',
+        'path': 'releases/mozilla-esr31',
         'revision': '{{ mozillaRevision }}',
         'relbranch': {% if mozillaRelbranch %}'{{ mozillaRelbranch }}'{% else %}None{% endif %},
         'bumpFiles': {
             'config/milestone.txt': {
                 'version': releaseConfig['milestone'],
                 'nextVersion': releaseConfig['nextMilestone']
             },
-            'js/src/config/milestone.txt': {
-                'version': releaseConfig['milestone'],
-                'nextVersion': releaseConfig['nextMilestone']
-            },
         }
     }
 }
 #  L10n repositories
 releaseConfig['l10nRelbranch']       = None
 releaseConfig['l10nRepoPath']        = 'releases/l10n/mozilla-release'
-releaseConfig['l10nRevisionFile']    = 'l10n-changesets_thunderbird-esr24'
+releaseConfig['l10nRevisionFile']    = 'l10n-changesets_thunderbird-esr31'
 #  Support repositories
 releaseConfig['otherReposToTag']     = {
     'build/compare-locales': 'RELEASE_AUTOMATION',
     'build/buildbot': 'production-0.8',
     'build/mozharness': 'production',
 }
 
 # Platform configuration
rename from mozilla/staging_release-thunderbird-comm-esr24.py
rename to mozilla/staging_release-thunderbird-comm-esr31.py
rename from mozilla/staging_release-thunderbird-comm-esr24.py.template
rename to mozilla/staging_release-thunderbird-comm-esr31.py.template
--- a/mozilla/staging_release-thunderbird-comm-esr24.py.template
+++ b/mozilla/staging_release-thunderbird-comm-esr31.py.template
@@ -41,52 +41,47 @@ releaseConfig['partialUpdates']      = {
 #  Next (nightly) version info
 releaseConfig['nextAppVersion']      = releaseConfig['appVersion']
 releaseConfig['nextMilestone']       = releaseConfig['milestone']
 #  Repository configuration, for tagging
 ## Staging repository path
 releaseConfig['userRepoRoot'] = 'users/stage-ffxbld'
 releaseConfig['sourceRepositories']  = {
     'comm': {
-        'name': 'comm-esr24',
-        'clonePath': 'releases/comm-esr24',
+        'name': 'comm-esr31',
+        'clonePath': 'releases/comm-esr31',
         'path': '{{ branch }}',
         'revision': '{{ commRevision }}',
         'relbranch': {% if commRelbranch %}'{{ commRelbranch }}'{% else %}None{% endif %},
         'bumpFiles': {
             'mail/config/version.txt': {
                 'version': releaseConfig['appVersion'],
                 'nextVersion': releaseConfig['nextAppVersion']
             },
         }
     },
     'mozilla': {
-        # XXX remove js/src/config/milestone.txt when setting up ESR31
-        'name': 'mozilla-esr24',
-        'clonePath': 'releases/mozilla-esr24',
-        'path': 'users/stage-ffxbld/mozilla-esr24',
+        'name': 'mozilla-esr31',
+        'clonePath': 'releases/mozilla-esr31',
+        'path': 'users/stage-ffxbld/mozilla-esr31',
         'revision': '{{ mozillaRevision }}',
         'relbranch': {% if mozillaRelbranch %}'{{ mozillaRelbranch }}'{% else %}None{% endif %},
         'bumpFiles': {
             'config/milestone.txt': {
                 'version': releaseConfig['milestone'],
                 'nextVersion': releaseConfig['nextMilestone']
             },
-            'js/src/config/milestone.txt': {
-                'version': releaseConfig['milestone'],
-                'nextVersion': releaseConfig['nextMilestone']
-            },
         },
     }
 }
 #  L10n repositories
 releaseConfig['l10nRelbranch']       = None
 releaseConfig['l10nRepoClonePath']   = 'releases/l10n/mozilla-release'
 releaseConfig['l10nRepoPath']        = 'users/stage-ffxbld'
-releaseConfig['l10nRevisionFile']    = 'l10n-changesets_thunderbird-esr24'
+releaseConfig['l10nRevisionFile']    = 'l10n-changesets_thunderbird-esr31'
 #  Support repositories
 releaseConfig['otherReposToTag']     = {
     'users/stage-ffxbld/compare-locales': 'RELEASE_AUTOMATION',
     'users/stage-ffxbld/buildbot': 'production-0.8',
     'users/stage-ffxbld/partner-repacks': 'default',
     'users/stage-ffxbld/mozharness': 'production',
 }
 
--- a/mozilla/thunderbird_config.py
+++ b/mozilla/thunderbird_config.py
@@ -634,18 +634,18 @@ for platform in PLATFORM_VARS.values():
 # platforms (if different from the default set).
 BRANCHES = {
     'comm-central': {
     },
     'comm-aurora': {
     },
     'comm-beta': {
     },
-    'comm-esr24': {
-        'gecko_version': 24,
+    'comm-esr31': {
+        'gecko_version': 31,
     },
     'try-comm-central': {
     },
 }
 
 # Copy project branches into BRANCHES keys
 for branch in ACTIVE_PROJECT_BRANCHES:
     BRANCHES[branch] = deepcopy(PROJECT_BRANCHES[branch])
@@ -773,52 +773,52 @@ BRANCHES['comm-central']['aus2_base_uplo
 BRANCHES['comm-central']['aus2_base_upload_dir_l10n'] = '/opt/aus2/incoming/2/Thunderbird/comm-central'
 BRANCHES['comm-central']['enable_blocklist_update'] = True
 BRANCHES['comm-central']['file_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-esr24
-BRANCHES['comm-esr24']['repo_path'] = 'releases/comm-esr24'
-BRANCHES['comm-esr24']['moz_repo_path'] = 'releases/mozilla-esr24'
-BRANCHES['comm-esr24']['mozilla_dir'] = 'mozilla'
-BRANCHES['comm-esr24']['update_channel'] = 'nightly-esr24'
-BRANCHES['comm-esr24']['skip_blank_repos'] = True
-BRANCHES['comm-esr24']['call_client_py'] = True
-BRANCHES['comm-esr24']['l10n_repo_path'] = 'releases/l10n/mozilla-esr24'
-BRANCHES['comm-esr24']['enable_weekly_bundle'] = True
-BRANCHES['comm-esr24']['start_hour'] = [3]
-BRANCHES['comm-esr24']['start_minute'] = [2]
-BRANCHES['comm-esr24']['enable_xulrunner'] = False
+######## comm-esr31
+BRANCHES['comm-esr31']['repo_path'] = 'releases/comm-esr31'
+BRANCHES['comm-esr31']['moz_repo_path'] = 'releases/mozilla-esr31'
+BRANCHES['comm-esr31']['mozilla_dir'] = 'mozilla'
+BRANCHES['comm-esr31']['update_channel'] = 'nightly-esr31'
+BRANCHES['comm-esr31']['skip_blank_repos'] = True
+BRANCHES['comm-esr31']['call_client_py'] = True
+BRANCHES['comm-esr31']['l10n_repo_path'] = 'releases/l10n/mozilla-esr31'
+BRANCHES['comm-esr31']['enable_weekly_bundle'] = True
+BRANCHES['comm-esr31']['start_hour'] = [3]
+BRANCHES['comm-esr31']['start_minute'] = [2]
+BRANCHES['comm-esr31']['enable_xulrunner'] = False
 # Enable unit tests
-BRANCHES['comm-esr24']['enable_mac_a11y'] = True
-BRANCHES['comm-esr24']['unittest_build_space'] = 6
+BRANCHES['comm-esr31']['enable_mac_a11y'] = True
+BRANCHES['comm-esr31']['unittest_build_space'] = 6
 # L10n configuration
-BRANCHES['comm-esr24']['enable_l10n'] = False
-BRANCHES['comm-esr24']['enable_l10n_onchange'] = False
-BRANCHES['comm-esr24']['l10nNightlyUpdate'] = False
-BRANCHES['comm-esr24']['l10n_platforms'] = ['linux', 'linux64', 'win32',
+BRANCHES['comm-esr31']['enable_l10n'] = False
+BRANCHES['comm-esr31']['enable_l10n_onchange'] = False
+BRANCHES['comm-esr31']['l10nNightlyUpdate'] = False
+BRANCHES['comm-esr31']['l10n_platforms'] = ['linux', 'linux64', 'win32',
                                             'macosx64']
-BRANCHES['comm-esr24']['l10nDatedDirs'] = True
-BRANCHES['comm-esr24']['l10n_tree'] = 'tbrel'
-BRANCHES['comm-esr24']['enUS_binaryURL'] = \
-    GLOBAL_VARS['download_base_url'] + '/nightly/latest-comm-esr24'
-BRANCHES['comm-esr24']['allLocalesFile'] = 'mail/locales/all-locales'
-BRANCHES['comm-esr24']['localesURL'] = \
-    '%s/build/buildbot-configs/raw-file/production/mozilla/l10n/all-locales.comm-esr24' % (GLOBAL_VARS['hgurl'])
-BRANCHES['comm-esr24']['enable_nightly'] = True
-BRANCHES['comm-esr24']['create_snippet'] = True
-BRANCHES['comm-esr24']['create_partial'] = True
-BRANCHES['comm-esr24']['aus2_base_upload_dir'] = '/opt/aus2/incoming/2/Thunderbird/comm-esr24'
-BRANCHES['comm-esr24']['aus2_base_upload_dir_l10n'] = '/opt/aus2/incoming/2/Thunderbird/comm-esr24'
-BRANCHES['comm-esr24']['enable_blocklist_update'] = False
-BRANCHES['comm-esr24']['file_update_on_closed_tree'] = False
-BRANCHES['comm-esr24']['enable_valgrind'] = False
+BRANCHES['comm-esr31']['l10nDatedDirs'] = True
+BRANCHES['comm-esr31']['l10n_tree'] = 'tbrel'
+BRANCHES['comm-esr31']['enUS_binaryURL'] = \
+    GLOBAL_VARS['download_base_url'] + '/nightly/latest-comm-esr31'
+BRANCHES['comm-esr31']['allLocalesFile'] = 'mail/locales/all-locales'
+BRANCHES['comm-esr31']['localesURL'] = \
+    '%s/build/buildbot-configs/raw-file/production/mozilla/l10n/all-locales.comm-esr31' % (GLOBAL_VARS['hgurl'])
+BRANCHES['comm-esr31']['enable_nightly'] = True
+BRANCHES['comm-esr31']['create_snippet'] = True
+BRANCHES['comm-esr31']['create_partial'] = True
+BRANCHES['comm-esr31']['aus2_base_upload_dir'] = '/opt/aus2/incoming/2/Thunderbird/comm-esr31'
+BRANCHES['comm-esr31']['aus2_base_upload_dir_l10n'] = '/opt/aus2/incoming/2/Thunderbird/comm-esr31'
+BRANCHES['comm-esr31']['enable_blocklist_update'] = False
+BRANCHES['comm-esr31']['file_update_on_closed_tree'] = False
+BRANCHES['comm-esr31']['enable_valgrind'] = False
 
 ######## comm-beta
 BRANCHES['comm-beta']['moz_repo_path'] = 'releases/mozilla-beta'
 BRANCHES['comm-beta']['mozilla_dir'] = 'mozilla'
 BRANCHES['comm-beta']['skip_blank_repos'] = True
 BRANCHES['comm-beta']['call_client_py'] = True
 BRANCHES['comm-beta']['repo_path'] = 'releases/comm-beta'
 BRANCHES['comm-beta']['l10n_repo_path'] = 'releases/l10n/mozilla-beta'
--- a/mozilla/thunderbird_preproduction_config.py
+++ b/mozilla/thunderbird_preproduction_config.py
@@ -45,17 +45,17 @@ BRANCHES = {
         'enable_blocklist_update': False,
         'file_update_on_closed_tree': False,
     },
     'comm-aurora': {
         'enable_blocklist_update': False,
         'file__update_on_closed_tree': False,
         'download_base_url': 'http://preproduction-stage.srv.releng.scl3.mozilla.com/pub/mozilla.org/thunderbird',
     },
-    'comm-esr24': {
+    'comm-esr31': {
         'enable_blocklist_update': False,
         'file_update_on_closed_tree': False,
     },
     'try-comm-central': {
         'download_base_url': 'http://preproduction-stage.srv.releng.scl3.mozilla.com/pub/mozilla.org/thunderbird/',
         'enable_mail_notifier': False, # Set to True when testing
         'email_override': [], # Set to your address when testing
         'package_url': 'http://preproduction-stage.srv.releng.scl3.mozilla.com/pub/mozilla.org/thunderbird/try-builds',
--- a/mozilla/thunderbird_production_config.py
+++ b/mozilla/thunderbird_production_config.py
@@ -51,19 +51,19 @@ GLOBAL_VARS['aus2_ssh_key'] = 'tbirdbld_
 GLOBAL_VARS['aus2_host'] = 'aus3-staging.mozilla.org'
 
 # Local branch overrides
 BRANCHES = {
     'comm-central': {
         'packaged_unittest_tinderbox_tree': 'Thunderbird',
         'tinderbox_tree': 'Thunderbird',
     },
-    'comm-esr24': {
-        'packaged_unittest_tinderbox_tree': 'Thunderbird-Esr24',
-        'tinderbox_tree': 'Thunderbird-Esr24',
+    'comm-esr31': {
+        'packaged_unittest_tinderbox_tree': 'Thunderbird-Esr31',
+        'tinderbox_tree': 'Thunderbird-Esr31',
     },
     'comm-beta': {
         'packaged_unittest_tinderbox_tree': 'Thunderbird-Beta',
         'tinderbox_tree': 'Thunderbird-Beta',
     },
     'comm-aurora': {
         'packaged_unittest_tinderbox_tree': 'Thunderbird-Aurora',
         'tinderbox_tree': 'Thunderbird-Aurora',
--- a/mozilla/thunderbird_staging_config.py
+++ b/mozilla/thunderbird_staging_config.py
@@ -42,17 +42,17 @@ BRANCHES = {
     'comm-beta': {
         'enable_blocklist_update': False,
         'file_update_on_closed_tree': False,
     },
     'comm-aurora': {
         'enable_blocklist_update': False,
         'file_update_on_closed_tree': False,
     },
-    'comm-esr24': {
+    'comm-esr31': {
         'enable_blocklist_update': False,
         'file_update_on_closed_tree': False,
     },
     'try-comm-central': {
         'download_base_url': 'http://dev-stage01.srv.releng.scl3.mozilla.com/pub/mozilla.org/thunderbird',
         'enable_mail_notifier': False, # Set to True when testing
         'email_override': [], # Set to your address when testing
         'package_url': 'http://dev-stage01.srv.releng.scl3.mozilla.com/pub/mozilla.org/thunderbird/try-builds',
rename from mozilla2/linux/comm-esr24/release/mozconfig
rename to mozilla2/linux/comm-esr31/release/mozconfig