Merging from default production
authorRail Aliiev <rail@mozilla.com>
Mon, 15 Sep 2014 13:21:40 -0400
branchproduction
changeset 10992 2e7fcdcd13ff607bad95f5e53465ce7da57c3e92
parent 10989 42dfbf2779899cf71ee2657416b842283762cf58 (current diff)
parent 10991 c4602ebf9eb4f3632c199bea9c90c019263f4c95 (diff)
child 10994 f2081be7d41b874dcae9061f412f19ec44360843
push id8087
push userraliiev@mozilla.com
push dateMon, 15 Sep 2014 17:27:43 +0000
bugs10990, 10988, 740142, 10991, 543109
Merging from default changeset: 10990:7ce0f6a33ca6 parent: 10988:1f6d5c0db33e user: Massimo Gervasini <mgervasini@mozilla.com> date: Mon Sep 15 17:44:21 2014 +0200 summary: Bug 740142 - removed obsolete options for mozharness desktop repacks. r=jlund changeset: 10991:c4602ebf9eb4 tag: tip user: Rail Aliiev <rail@mozilla.com> date: Mon Sep 15 13:21:06 2014 -0400 summary: Bug 543109 - Mobile release automation to move candidates to releases/ (push to mirrors). r=bhearsum
mozilla/config.py
mozilla/release-firefox-mozilla-beta.py
mozilla/release-firefox-mozilla-release.py
mozilla/release-thunderbird-comm-esr24.py
mozilla/release-thunderbird-comm-esr31.py
--- a/mozilla/config.py
+++ b/mozilla/config.py
@@ -153,17 +153,16 @@ PLATFORM_VARS = {
                 ],
                 'script_timeout': 3 * 3600,
                 'script_maxtime': int(5.5 * 3600),
             },
             'mozharness_desktop_l10n': {
                 'scriptName': 'scripts/desktop_l10n.py',
                 'l10n_chunks': 10,
                 'use_credentials_file': True,
-                'config': 'single_locale/linux.py',
             },
             'dep_signing_servers': 'dep-signing',
             'base_name': 'Linux %(branch)s',
             'product_name': 'firefox',
             'unittest_platform': 'linux-opt',
             'app_name': 'browser',
             'brand_name': 'Minefield',
             'mozconfig': 'linux/%(branch)s/nightly',
@@ -274,17 +273,16 @@ PLATFORM_VARS = {
             'mozharness_non_unified_extra_args': [
                 '--config', 'builds/releng_base_linux_64_builds.py',
                 '--custom-build-variant-cfg', 'non-unified',
             ],
             'mozharness_desktop_l10n': {
                 'scriptName': 'scripts/desktop_l10n.py',
                 'l10n_chunks': 10,
                 'use_credentials_file': True,
-                'config': 'single_locale/linux64.py',
             },
             'product_name': 'firefox',
             'unittest_platform': 'linux64-opt',
             'app_name': 'browser',
             'brand_name': 'Minefield',
             'base_name': 'Linux x86-64 %(branch)s',
             'mozconfig': 'linux64/%(branch)s/nightly',
             'src_mozconfig': 'browser/config/mozconfigs/linux64/nightly',
@@ -846,17 +844,16 @@ PLATFORM_VARS = {
             'mozharness_non_unified_extra_args': [
                 '--config', 'builds/releng_base_mac_64_builds.py',
                 '--custom-build-variant-cfg', 'non-unified',
             ],
             'mozharness_desktop_l10n': {
                 'scriptName': 'scripts/desktop_l10n.py',
                 'l10n_chunks': 10,
                 'use_credentials_file': True,
-                'config': 'single_locale/macosx64.py',
             },
 
             'product_name': 'firefox',
             'unittest_platform': 'macosx64-opt',
             'app_name': 'browser',
             'brand_name': 'Minefield',
             'base_name': 'OS X 10.7 %(branch)s',
             'mozconfig': 'macosx64/%(branch)s/nightly',
@@ -985,17 +982,16 @@ PLATFORM_VARS = {
             'mozharness_non_unified_extra_args': [
                 '--config', 'builds/releng_base_windows_32_builds.py',
                 '--custom-build-variant-cfg', 'non-unified',
             ],
             'mozharness_desktop_l10n': {
                 'scriptName': 'scripts/desktop_l10n.py',
                 'l10n_chunks': 10,
                 'use_credentials_file': True,
-                'config': 'single_locale/win32.py',
             },
 
             'product_name': 'firefox',
             'unittest_platform': 'win32-opt',
             'app_name': 'browser',
             'brand_name': 'Minefield',
             'base_name': 'WINNT 5.2 %(branch)s',
             'mozconfig': 'win32/%(branch)s/nightly',
@@ -1047,17 +1043,16 @@ PLATFORM_VARS = {
             'tooltool_script': ['python', '/c/mozilla-build/tooltool.py'],
         },
         'win64': {
             'mozharness_python': ['c:/mozilla-build/python27/python', '-u'],
             'mozharness_desktop_l10n': {
                 'scriptName': 'scripts/desktop_l10n.py',
                 'l10n_chunks': 10,
                 'use_credentials_file': True,
-                'config': 'single_locale/win64.py',
             },
             'reboot_command': [
                 'c:/mozilla-build/python27/python', '-u',
                 'scripts/external_tools/count_and_reboot.py',
                 '-f', '../reboot_count.txt','-n', '1', '-z'
             ],
 
             'product_name': 'firefox',
--- a/mozilla/release-fennec-mozilla-beta.py
+++ b/mozilla/release-fennec-mozilla-beta.py
@@ -14,16 +14,17 @@ releaseConfig['AllRecipients']       = [
                                         '<qa-drivers@mozilla.com>']
 releaseConfig['ImportantRecipients'] = ['<release-drivers@mozilla.org>',]
 releaseConfig['releaseTemplates']    = 'release_templates'
 releaseConfig['messagePrefix']       = '[release] '
 
 # Basic product configuration
 #  Names for the product/files
 releaseConfig['productName']         = 'fennec'
+releaseConfig['stage_product']       = 'mobile'
 releaseConfig['appName']             = 'mobile'
 releaseConfig['relbranchPrefix']     = 'MOBILE'
 #  Current version info
 releaseConfig['version']             = '33.0b2'
 releaseConfig['appVersion']          = '33.0'
 releaseConfig['milestone']           = releaseConfig['appVersion']
 releaseConfig['buildNumber']         = 1
 releaseConfig['baseTag']             = 'FENNEC_33_0b2'
@@ -106,17 +107,16 @@ releaseConfig['releaseChannel']      = '
 releaseConfig['enable_repo_setup']       = False
 
 # Fennec specific
 releaseConfig['usePrettyNames']           = False
 releaseConfig['disableBouncerEntries']    = True
 releaseConfig['disableStandaloneRepacks'] = True
 releaseConfig['disablePermissionCheck']   = True
 releaseConfig['disableVirusCheck']        = True
-releaseConfig['disablePushToMirrors']     = True
 releaseConfig['enableUpdatePackaging']    = False
 releaseConfig['balrog_api_root']          = None
 
 releaseConfig['single_locale_options'] = {
     'android': [
         '--cfg',
         'single_locale/release_mozilla-beta_android.py',
         '--tag-override', '%s_RELEASE' % releaseConfig['baseTag'],
@@ -137,9 +137,10 @@ releaseConfig['multilocale_config'] = {
         '--package-multi',
         '--summary',
     ]
 }
 releaseConfig['enableSigningAtBuildTime'] = True
 releaseConfig['enablePartialMarsAtBuildTime'] = False
 releaseConfig['autoGenerateChecksums'] = False
 releaseConfig['use_mock'] = True
-releaseConfig['mock_platforms'] = ('android', 'android-x86', 'linux')
\ No newline at end of file
+releaseConfig['mock_platforms'] = ('android', 'android-x86', 'linux')
+releaseConfig['ftpSymlinkName'] = 'latest-beta'
--- a/mozilla/release-fennec-mozilla-beta.py.template
+++ b/mozilla/release-fennec-mozilla-beta.py.template
@@ -14,16 +14,17 @@ releaseConfig['AllRecipients']       = [
                                         '<qa-drivers@mozilla.com>']
 releaseConfig['ImportantRecipients'] = ['<release-drivers@mozilla.org>',]
 releaseConfig['releaseTemplates']    = 'release_templates'
 releaseConfig['messagePrefix']       = '[release] '
 
 # Basic product configuration
 #  Names for the product/files
 releaseConfig['productName']         = 'fennec'
+releaseConfig['stage_product']       = 'mobile'
 releaseConfig['appName']             = 'mobile'
 releaseConfig['relbranchPrefix']     = 'MOBILE'
 #  Current version info
 releaseConfig['version']             = '{{ version }}'
 releaseConfig['appVersion']          = '{{ appVersion }}'
 releaseConfig['milestone']           = releaseConfig['appVersion']
 releaseConfig['buildNumber']         = {{ buildNumber }}
 releaseConfig['baseTag']             = '{{ baseTag }}'
@@ -106,17 +107,16 @@ releaseConfig['releaseChannel']      = '
 releaseConfig['enable_repo_setup']       = False
 
 # Fennec specific
 releaseConfig['usePrettyNames']           = False
 releaseConfig['disableBouncerEntries']    = True
 releaseConfig['disableStandaloneRepacks'] = True
 releaseConfig['disablePermissionCheck']   = True
 releaseConfig['disableVirusCheck']        = True
-releaseConfig['disablePushToMirrors']     = True
 releaseConfig['enableUpdatePackaging']    = False
 releaseConfig['balrog_api_root']          = None
 
 releaseConfig['single_locale_options'] = {
     'android': [
         '--cfg',
         'single_locale/release_mozilla-beta_android.py',
         '--tag-override', '%s_RELEASE' % releaseConfig['baseTag'],
@@ -138,8 +138,9 @@ releaseConfig['multilocale_config'] = {
         '--summary',
     ]
 }
 releaseConfig['enableSigningAtBuildTime'] = True
 releaseConfig['enablePartialMarsAtBuildTime'] = False
 releaseConfig['autoGenerateChecksums'] = False
 releaseConfig['use_mock'] = True
 releaseConfig['mock_platforms'] = ('android', 'android-x86', 'linux')
+releaseConfig['ftpSymlinkName'] = 'latest-beta'
--- a/mozilla/release-fennec-mozilla-esr31.py
+++ b/mozilla/release-fennec-mozilla-esr31.py
@@ -14,16 +14,17 @@ releaseConfig['AllRecipients']       = [
                                         '<qa-drivers@mozilla.com>']
 releaseConfig['ImportantRecipients'] = ['<release-drivers@mozilla.org>',]
 releaseConfig['releaseTemplates']    = 'release_templates'
 releaseConfig['messagePrefix']       = '[release] '
 
 # Basic product configuration
 #  Names for the product/files
 releaseConfig['productName']         = 'fennec'
+releaseConfig['stage_product']       = 'mobile'
 releaseConfig['appName']             = 'mobile'
 releaseConfig['relbranchPrefix']     = 'MOBILE'
 
 # Function for bumping Android Version Code
 # see bug 1040319
 def bumpIntegerInFile(previousContents):
     return str(int(previousContents) + 1)
 
@@ -115,17 +116,16 @@ releaseConfig['releaseChannel']      = '
 releaseConfig['enable_repo_setup']       = False
 
 # Fennec specific
 releaseConfig['usePrettyNames']           = False
 releaseConfig['disableBouncerEntries']    = True
 releaseConfig['disableStandaloneRepacks'] = True
 releaseConfig['disablePermissionCheck']   = True
 releaseConfig['disableVirusCheck']        = True
-releaseConfig['disablePushToMirrors']     = True
 releaseConfig['enableUpdatePackaging']    = False
 releaseConfig['balrog_api_root']          = None
 
 releaseConfig['multilocale_config'] = {
     'platforms': {
         'android-armv6':
             'multi_locale/release_mozilla-esr_android-armv6.json',
     },
@@ -137,9 +137,9 @@ releaseConfig['multilocale_config'] = {
         '--summary',
     ]
 }
 releaseConfig['build_tools_repo_path'] = 'build/tools'
 releaseConfig['enableSigningAtBuildTime'] = True
 releaseConfig['enablePartialMarsAtBuildTime'] = False
 releaseConfig['autoGenerateChecksums'] = False
 releaseConfig['use_mock'] = True
-releaseConfig['mock_platforms'] = ('android-armv6',)
\ No newline at end of file
+releaseConfig['mock_platforms'] = ('android-armv6',)
--- a/mozilla/release-fennec-mozilla-esr31.py.template
+++ b/mozilla/release-fennec-mozilla-esr31.py.template
@@ -14,16 +14,17 @@ releaseConfig['AllRecipients']       = [
                                         '<qa-drivers@mozilla.com>']
 releaseConfig['ImportantRecipients'] = ['<release-drivers@mozilla.org>',]
 releaseConfig['releaseTemplates']    = 'release_templates'
 releaseConfig['messagePrefix']       = '[release] '
 
 # Basic product configuration
 #  Names for the product/files
 releaseConfig['productName']         = 'fennec'
+releaseConfig['stage_product']       = 'mobile'
 releaseConfig['appName']             = 'mobile'
 releaseConfig['relbranchPrefix']     = 'MOBILE'
 
 # Function for bumping Android Version Code
 # see bug 1040319
 def bumpIntegerInFile(previousContents):
     return str(int(previousContents) + 1)
 
@@ -115,17 +116,16 @@ releaseConfig['releaseChannel']      = '
 releaseConfig['enable_repo_setup']       = False
 
 # Fennec specific
 releaseConfig['usePrettyNames']           = False
 releaseConfig['disableBouncerEntries']    = True
 releaseConfig['disableStandaloneRepacks'] = True
 releaseConfig['disablePermissionCheck']   = True
 releaseConfig['disableVirusCheck']        = True
-releaseConfig['disablePushToMirrors']     = True
 releaseConfig['enableUpdatePackaging']    = False
 releaseConfig['balrog_api_root']          = None
 
 releaseConfig['multilocale_config'] = {
     'platforms': {
         'android-armv6':
             'multi_locale/release_mozilla-esr_android-armv6.json',
     },
--- a/mozilla/release-fennec-mozilla-release.py
+++ b/mozilla/release-fennec-mozilla-release.py
@@ -14,16 +14,17 @@ releaseConfig['AllRecipients']       = [
                                         '<qa-drivers@mozilla.com>']
 releaseConfig['ImportantRecipients'] = ['<release-drivers@mozilla.org>',]
 releaseConfig['releaseTemplates']    = 'release_templates'
 releaseConfig['messagePrefix']       = '[release] '
 
 # Basic product configuration
 #  Names for the product/files
 releaseConfig['productName']         = 'fennec'
+releaseConfig['stage_product']       = 'mobile'
 releaseConfig['appName']             = 'mobile'
 releaseConfig['relbranchPrefix']     = 'MOBILE'
 #  Current version info
 releaseConfig['version']             = '32.0.1'
 releaseConfig['appVersion']          = '32.0.1'
 releaseConfig['milestone']           = releaseConfig['appVersion']
 releaseConfig['buildNumber']         = 1
 releaseConfig['baseTag']             = 'FENNEC_32_0_1'
@@ -115,17 +116,16 @@ releaseConfig['mozconfigs']          = {
 releaseConfig['enable_repo_setup']       = False
 
 # Fennec specific
 releaseConfig['usePrettyNames']           = False
 releaseConfig['disableBouncerEntries']    = True
 releaseConfig['disableStandaloneRepacks'] = True
 releaseConfig['disablePermissionCheck']   = True
 releaseConfig['disableVirusCheck']        = True
-releaseConfig['disablePushToMirrors']     = True
 releaseConfig['enableUpdatePackaging']    = False
 releaseConfig['balrog_api_root']          = None
 
 releaseConfig['single_locale_options'] = {
     'android': [
         '--cfg',
         'single_locale/release_mozilla-release_android.py',
         '--tag-override', '%s_RELEASE' % releaseConfig['baseTag'],
@@ -146,9 +146,10 @@ releaseConfig['multilocale_config'] = {
         '--package-multi',
         '--summary',
     ]
 }
 releaseConfig['enableSigningAtBuildTime'] = True
 releaseConfig['enablePartialMarsAtBuildTime'] = False
 releaseConfig['autoGenerateChecksums'] = False
 releaseConfig['use_mock'] = True
-releaseConfig['mock_platforms'] = ('android', 'android-x86', 'linux')
\ No newline at end of file
+releaseConfig['mock_platforms'] = ('android', 'android-x86', 'linux')
+releaseConfig['ftpSymlinkName'] = 'latest'
--- a/mozilla/release-fennec-mozilla-release.py.template
+++ b/mozilla/release-fennec-mozilla-release.py.template
@@ -14,16 +14,17 @@ releaseConfig['AllRecipients']       = [
                                         '<qa-drivers@mozilla.com>']
 releaseConfig['ImportantRecipients'] = ['<release-drivers@mozilla.org>',]
 releaseConfig['releaseTemplates']    = 'release_templates'
 releaseConfig['messagePrefix']       = '[release] '
 
 # Basic product configuration
 #  Names for the product/files
 releaseConfig['productName']         = 'fennec'
+releaseConfig['stage_product']       = 'mobile'
 releaseConfig['appName']             = 'mobile'
 releaseConfig['relbranchPrefix']     = 'MOBILE'
 #  Current version info
 releaseConfig['version']             = '{{ version }}'
 releaseConfig['appVersion']          = '{{ appVersion }}'
 releaseConfig['milestone']           = releaseConfig['appVersion']
 releaseConfig['buildNumber']         = {{ buildNumber }}
 releaseConfig['baseTag']             = '{{ baseTag }}'
@@ -115,17 +116,16 @@ releaseConfig['mozconfigs']          = {
 releaseConfig['enable_repo_setup']       = False
 
 # Fennec specific
 releaseConfig['usePrettyNames']           = False
 releaseConfig['disableBouncerEntries']    = True
 releaseConfig['disableStandaloneRepacks'] = True
 releaseConfig['disablePermissionCheck']   = True
 releaseConfig['disableVirusCheck']        = True
-releaseConfig['disablePushToMirrors']     = True
 releaseConfig['enableUpdatePackaging']    = False
 releaseConfig['balrog_api_root']          = None
 
 releaseConfig['single_locale_options'] = {
     'android': [
         '--cfg',
         'single_locale/release_mozilla-release_android.py',
         '--tag-override', '%s_RELEASE' % releaseConfig['baseTag'],
@@ -147,8 +147,9 @@ releaseConfig['multilocale_config'] = {
         '--summary',
     ]
 }
 releaseConfig['enableSigningAtBuildTime'] = True
 releaseConfig['enablePartialMarsAtBuildTime'] = False
 releaseConfig['autoGenerateChecksums'] = False
 releaseConfig['use_mock'] = True
 releaseConfig['mock_platforms'] = ('android', 'android-x86', 'linux')
+releaseConfig['ftpSymlinkName'] = 'latest'
--- a/mozilla/release-firefox-mozilla-beta.py
+++ b/mozilla/release-firefox-mozilla-beta.py
@@ -15,16 +15,17 @@ releaseConfig['AllRecipients']       = [
 releaseConfig['ImportantRecipients'] = ['<release-drivers@mozilla.org>',]
 releaseConfig['AVVendorsRecipients'] = ['<av-vendor-release-announce@mozilla.org>',]
 releaseConfig['releaseTemplates']    = 'release_templates'
 releaseConfig['messagePrefix']       = '[release] '
 
 # Basic product configuration
 #  Names for the product/files
 releaseConfig['productName']         = 'firefox'
+releaseConfig['stage_product']       = 'firefox'
 releaseConfig['appName']             = 'browser'
 #  Current version info
 releaseConfig['version']             = '33.0b3'
 releaseConfig['appVersion']          = '33.0'
 releaseConfig['milestone']           = releaseConfig['appVersion']
 releaseConfig['buildNumber']         = 1
 releaseConfig['baseTag']             = 'FIREFOX_33_0b3'
 releaseConfig['partialUpdates']      = {
@@ -145,9 +146,9 @@ releaseConfig['enable_repo_setup'] = Fal
 releaseConfig['enableAutomaticPushToMirrors'] = True
 releaseConfig['use_mock'] = True
 releaseConfig['mock_platforms'] = ('linux','linux64')
 releaseConfig['ftpSymlinkName'] = 'latest-beta'
 
 releaseConfig['bouncer_aliases'] = {
     'Firefox-%(version)s': 'firefox-beta-latest',
     'Firefox-%(version)s-stub': 'firefox-beta-stub',
-}
\ No newline at end of file
+}
--- a/mozilla/release-firefox-mozilla-beta.py.template
+++ b/mozilla/release-firefox-mozilla-beta.py.template
@@ -15,16 +15,17 @@ releaseConfig['AllRecipients']       = [
 releaseConfig['ImportantRecipients'] = ['<release-drivers@mozilla.org>',]
 releaseConfig['AVVendorsRecipients'] = ['<av-vendor-release-announce@mozilla.org>',]
 releaseConfig['releaseTemplates']    = 'release_templates'
 releaseConfig['messagePrefix']       = '[release] '
 
 # Basic product configuration
 #  Names for the product/files
 releaseConfig['productName']         = 'firefox'
+releaseConfig['stage_product']       = 'firefox'
 releaseConfig['appName']             = 'browser'
 #  Current version info
 releaseConfig['version']             = '{{ version }}'
 releaseConfig['appVersion']          = '{{ appVersion }}'
 releaseConfig['milestone']           = releaseConfig['appVersion']
 releaseConfig['buildNumber']         = {{ buildNumber }}
 releaseConfig['baseTag']             = '{{ baseTag }}'
 releaseConfig['partialUpdates']      = {
--- a/mozilla/release-firefox-mozilla-esr24.py
+++ b/mozilla/release-firefox-mozilla-esr24.py
@@ -16,16 +16,17 @@ releaseConfig['AllRecipients']       = [
 releaseConfig['ImportantRecipients'] = ['<release-drivers@mozilla.org>', '<mikeperry@torproject.org>']
 releaseConfig['AVVendorsRecipients'] = ['<av-vendor-release-announce@mozilla.org>',]
 releaseConfig['releaseTemplates']    = 'release_templates'
 releaseConfig['messagePrefix']       = '[release] '
 
 # Basic product configuration
 #  Names for the product/files
 releaseConfig['productName']         = 'firefox'
+releaseConfig['stage_product']       = 'firefox'
 releaseConfig['appName']             = 'browser'
 #  Current version info
 releaseConfig['version']             = '24.8.0esr'
 releaseConfig['appVersion']          = '24.8.0'
 releaseConfig['milestone']           = releaseConfig['appVersion']
 releaseConfig['buildNumber']         = 1
 releaseConfig['baseTag']             = 'FIREFOX_24_8_0esr'
 releaseConfig['partialUpdates']      = {
@@ -135,9 +136,9 @@ releaseConfig['partnersRepoPath']    = '
 releaseConfig['tuxedoServerUrl']     = 'https://bounceradmin.mozilla.com/api'
 releaseConfig['bouncer_submitter_config'] = 'releases/bouncer_firefox_esr.py'
 
 # Misc configuration
 releaseConfig['enable_repo_setup'] = False
 releaseConfig['enableAutomaticPushToMirrors'] = False
 releaseConfig['use_mock'] = True
 releaseConfig['mock_platforms'] = ('linux','linux64')
-releaseConfig['ftpSymlinkName'] = 'latest-24.0esr'
\ No newline at end of file
+releaseConfig['ftpSymlinkName'] = 'latest-24.0esr'
--- a/mozilla/release-firefox-mozilla-esr24.py.template
+++ b/mozilla/release-firefox-mozilla-esr24.py.template
@@ -16,16 +16,17 @@ releaseConfig['AllRecipients']       = [
 releaseConfig['ImportantRecipients'] = ['<release-drivers@mozilla.org>', '<mikeperry@torproject.org>']
 releaseConfig['AVVendorsRecipients'] = ['<av-vendor-release-announce@mozilla.org>',]
 releaseConfig['releaseTemplates']    = 'release_templates'
 releaseConfig['messagePrefix']       = '[release] '
 
 # Basic product configuration
 #  Names for the product/files
 releaseConfig['productName']         = 'firefox'
+releaseConfig['stage_product']       = 'firefox'
 releaseConfig['appName']             = 'browser'
 #  Current version info
 releaseConfig['version']             = '{{ version }}'
 releaseConfig['appVersion']          = '{{ appVersion }}'
 releaseConfig['milestone']           = releaseConfig['appVersion']
 releaseConfig['buildNumber']         = {{ buildNumber }}
 releaseConfig['baseTag']             = '{{ baseTag }}'
 releaseConfig['partialUpdates']      = {
--- a/mozilla/release-firefox-mozilla-esr31.py
+++ b/mozilla/release-firefox-mozilla-esr31.py
@@ -16,16 +16,17 @@ releaseConfig['AllRecipients']       = [
 releaseConfig['ImportantRecipients'] = ['<release-drivers@mozilla.org>', '<mikeperry@torproject.org>']
 releaseConfig['AVVendorsRecipients'] = ['<av-vendor-release-announce@mozilla.org>',]
 releaseConfig['releaseTemplates']    = 'release_templates'
 releaseConfig['messagePrefix']       = '[release] '
 
 # Basic product configuration
 #  Names for the product/files
 releaseConfig['productName']         = 'firefox'
+releaseConfig['stage_product']       = 'firefox'
 releaseConfig['appName']             = 'browser'
 #  Current version info
 releaseConfig['version']             = '31.1.0esr'
 releaseConfig['appVersion']          = '31.1.0'
 releaseConfig['milestone']           = releaseConfig['appVersion']
 releaseConfig['buildNumber']         = 1
 releaseConfig['baseTag']             = 'FIREFOX_31_1_0esr'
 releaseConfig['partialUpdates']      = {
@@ -130,9 +131,9 @@ releaseConfig['partnersRepoPath']    = '
 releaseConfig['tuxedoServerUrl']     = 'https://bounceradmin.mozilla.com/api'
 releaseConfig['bouncer_submitter_config'] = 'releases/bouncer_firefox_esr.py'
 
 # Misc configuration
 releaseConfig['enable_repo_setup'] = False
 releaseConfig['enableAutomaticPushToMirrors'] = False
 releaseConfig['use_mock'] = True
 releaseConfig['mock_platforms'] = ('linux','linux64')
-releaseConfig['ftpSymlinkName'] = 'latest-esr'
\ No newline at end of file
+releaseConfig['ftpSymlinkName'] = 'latest-esr'
--- a/mozilla/release-firefox-mozilla-esr31.py.template
+++ b/mozilla/release-firefox-mozilla-esr31.py.template
@@ -16,16 +16,17 @@ releaseConfig['AllRecipients']       = [
 releaseConfig['ImportantRecipients'] = ['<release-drivers@mozilla.org>', '<mikeperry@torproject.org>']
 releaseConfig['AVVendorsRecipients'] = ['<av-vendor-release-announce@mozilla.org>',]
 releaseConfig['releaseTemplates']    = 'release_templates'
 releaseConfig['messagePrefix']       = '[release] '
 
 # Basic product configuration
 #  Names for the product/files
 releaseConfig['productName']         = 'firefox'
+releaseConfig['stage_product']       = 'firefox'
 releaseConfig['appName']             = 'browser'
 #  Current version info
 releaseConfig['version']             = '{{ version }}'
 releaseConfig['appVersion']          = '{{ appVersion }}'
 releaseConfig['milestone']           = releaseConfig['appVersion']
 releaseConfig['buildNumber']         = {{ buildNumber }}
 releaseConfig['baseTag']             = '{{ baseTag }}'
 releaseConfig['partialUpdates']      = {
--- a/mozilla/release-firefox-mozilla-release.py
+++ b/mozilla/release-firefox-mozilla-release.py
@@ -15,16 +15,17 @@ releaseConfig['AllRecipients']       = [
 releaseConfig['ImportantRecipients'] = ['<release-drivers@mozilla.org>',]
 releaseConfig['AVVendorsRecipients'] = ['<av-vendor-release-announce@mozilla.org>',]
 releaseConfig['releaseTemplates']    = 'release_templates'
 releaseConfig['messagePrefix']       = '[release] '
 
 # Basic product configuration
 #  Names for the product/files
 releaseConfig['productName']         = 'firefox'
+releaseConfig['stage_product']       = 'firefox'
 releaseConfig['appName']             = 'browser'
 #  Current version info
 releaseConfig['version']             = '32.0.1'
 releaseConfig['appVersion']          = '32.0.1'
 releaseConfig['milestone']           = releaseConfig['appVersion']
 releaseConfig['buildNumber']         = 2
 releaseConfig['baseTag']             = 'FIREFOX_32_0_1'
 releaseConfig['partialUpdates']      = {
@@ -160,9 +161,9 @@ releaseConfig['enable_repo_setup'] = Fal
 releaseConfig['use_mock'] = True
 releaseConfig['mock_platforms'] = ('linux','linux64')
 releaseConfig['ftpSymlinkName'] = 'latest'
 
 releaseConfig['bouncer_aliases'] = {
     'Firefox-%(version)s': 'firefox-latest',
     'Firefox-%(version)s-stub': 'firefox-stub',
     'Firefox-%(version)s-EUBallot': 'firefox-latest-euballot',
-}
\ No newline at end of file
+}
--- a/mozilla/release-firefox-mozilla-release.py.template
+++ b/mozilla/release-firefox-mozilla-release.py.template
@@ -15,16 +15,17 @@ releaseConfig['AllRecipients']       = [
 releaseConfig['ImportantRecipients'] = ['<release-drivers@mozilla.org>',]
 releaseConfig['AVVendorsRecipients'] = ['<av-vendor-release-announce@mozilla.org>',]
 releaseConfig['releaseTemplates']    = 'release_templates'
 releaseConfig['messagePrefix']       = '[release] '
 
 # Basic product configuration
 #  Names for the product/files
 releaseConfig['productName']         = 'firefox'
+releaseConfig['stage_product']       = 'firefox'
 releaseConfig['appName']             = 'browser'
 #  Current version info
 releaseConfig['version']             = '{{ version }}'
 releaseConfig['appVersion']          = '{{ appVersion }}'
 releaseConfig['milestone']           = releaseConfig['appVersion']
 releaseConfig['buildNumber']         = {{ buildNumber }}
 releaseConfig['baseTag']             = '{{ baseTag }}'
 releaseConfig['partialUpdates']      = {
--- a/mozilla/release-thunderbird-comm-beta.py
+++ b/mozilla/release-thunderbird-comm-beta.py
@@ -13,16 +13,17 @@ releaseConfig['AllRecipients']       = [
 releaseConfig['ImportantRecipients'] = ['<thunderbird-drivers@mozilla.org>',]
 releaseConfig['AVVendorsRecipients'] = ['<av-vendor-release-announce@mozilla.org>',]
 releaseConfig['releaseTemplates']    = 'release_templates'
 releaseConfig['messagePrefix']       = '[release] '
 
 # Basic product configuration
 #  Names for the product/files
 releaseConfig['productName']         = 'thunderbird'
+releaseConfig['stage_product']       = 'thunderbird'
 releaseConfig['appName']             = 'mail'
 releaseConfig['mozilla_dir']         = 'mozilla'
 #  Current version info
 releaseConfig['version']             = '32.0b1'
 releaseConfig['appVersion']          = '32.0'
 releaseConfig['milestone']           = releaseConfig['appVersion']
 releaseConfig['buildNumber']         = 1
 releaseConfig['baseTag']             = 'THUNDERBIRD_32_0b1'
@@ -134,9 +135,9 @@ releaseConfig['partnersRepoPath']    = '
 releaseConfig['tuxedoServerUrl']     = 'https://bounceradmin.mozilla.com/api'
 releaseConfig['bouncer_submitter_config'] = 'releases/bouncer_thunderbird.py'
 
 # Misc configuration
 releaseConfig['enable_repo_setup'] = False
 releaseConfig['enableAutomaticPushToMirrors'] = True
 releaseConfig['use_mock'] = True
 releaseConfig['mock_platforms'] = ('linux','linux64')
-releaseConfig['ftpSymlinkName'] = 'latest-beta'
\ No newline at end of file
+releaseConfig['ftpSymlinkName'] = 'latest-beta'
--- a/mozilla/release-thunderbird-comm-beta.py.template
+++ b/mozilla/release-thunderbird-comm-beta.py.template
@@ -13,16 +13,17 @@ releaseConfig['AllRecipients']       = [
 releaseConfig['ImportantRecipients'] = ['<thunderbird-drivers@mozilla.org>',]
 releaseConfig['AVVendorsRecipients'] = ['<av-vendor-release-announce@mozilla.org>',]
 releaseConfig['releaseTemplates']    = 'release_templates'
 releaseConfig['messagePrefix']       = '[release] '
 
 # Basic product configuration
 #  Names for the product/files
 releaseConfig['productName']         = 'thunderbird'
+releaseConfig['stage_product']       = 'thunderbird'
 releaseConfig['appName']             = 'mail'
 # MERGE DAY (remove 'mozilla_dir' once comm-beta no longer services Gecko 33 and lower)
 releaseConfig['mozilla_dir']         = 'mozilla'
 releaseConfig['mozilla_srcdir']      = 'mozilla'
 #  Current version info
 releaseConfig['version']             = '{{ version }}'
 releaseConfig['appVersion']          = '{{ appVersion }}'
 releaseConfig['milestone']           = releaseConfig['appVersion']
--- a/mozilla/release-thunderbird-comm-esr24.py
+++ b/mozilla/release-thunderbird-comm-esr24.py
@@ -13,16 +13,17 @@ releaseConfig['AllRecipients']       = [
 releaseConfig['ImportantRecipients'] = ['<thunderbird-drivers@mozilla.org>',]
 releaseConfig['AVVendorsRecipients'] = ['<av-vendor-release-announce@mozilla.org>',]
 releaseConfig['releaseTemplates']    = 'release_templates'
 releaseConfig['messagePrefix']       = '[release] '
 
 # Basic product configuration
 #  Names for the product/files
 releaseConfig['productName']         = 'thunderbird'
+releaseConfig['stage_product']       = 'thunderbird'
 releaseConfig['appName']             = 'mail'
 releaseConfig['mozilla_dir']         = 'mozilla'
 #  Current version info
 releaseConfig['version']             = '24.8.0'
 releaseConfig['appVersion']          = '24.8.0'
 releaseConfig['milestone']           = releaseConfig['appVersion']
 releaseConfig['buildNumber']         = 1
 releaseConfig['baseTag']             = 'THUNDERBIRD_24_8_0'
@@ -125,9 +126,9 @@ releaseConfig['partnersRepoPath']    = '
 # Tuxedo/Bouncer configuration
 releaseConfig['tuxedoServerUrl']     = 'https://bounceradmin.mozilla.com/api'
 releaseConfig['bouncer_submitter_config'] = 'releases/bouncer_thunderbird.py'
 
 # Misc configuration
 releaseConfig['enable_repo_setup'] = False
 releaseConfig['use_mock'] = True
 releaseConfig['mock_platforms'] = ('linux','linux64')
-releaseConfig['ftpSymlinkName'] = 'latest-24.0esr'
\ No newline at end of file
+releaseConfig['ftpSymlinkName'] = 'latest-24.0esr'
--- a/mozilla/release-thunderbird-comm-esr24.py.template
+++ b/mozilla/release-thunderbird-comm-esr24.py.template
@@ -13,16 +13,17 @@ releaseConfig['AllRecipients']       = [
 releaseConfig['ImportantRecipients'] = ['<thunderbird-drivers@mozilla.org>',]
 releaseConfig['AVVendorsRecipients'] = ['<av-vendor-release-announce@mozilla.org>',]
 releaseConfig['releaseTemplates']    = 'release_templates'
 releaseConfig['messagePrefix']       = '[release] '
 
 # Basic product configuration
 #  Names for the product/files
 releaseConfig['productName']         = 'thunderbird'
+releaseConfig['stage_product']       = 'thunderbird'
 releaseConfig['appName']             = 'mail'
 releaseConfig['mozilla_dir']         = 'mozilla'
 releaseConfig['mozilla_srcdir']      = 'mozilla'
 #  Current version info
 releaseConfig['version']             = '{{ version }}'
 releaseConfig['appVersion']          = '{{ appVersion }}'
 releaseConfig['milestone']           = releaseConfig['appVersion']
 releaseConfig['buildNumber']         = {{ buildNumber }}
--- a/mozilla/release-thunderbird-comm-esr31.py
+++ b/mozilla/release-thunderbird-comm-esr31.py
@@ -13,16 +13,17 @@ releaseConfig['AllRecipients']       = [
 releaseConfig['ImportantRecipients'] = ['<thunderbird-drivers@mozilla.org>',]
 releaseConfig['AVVendorsRecipients'] = ['<av-vendor-release-announce@mozilla.org>',]
 releaseConfig['releaseTemplates']    = 'release_templates'
 releaseConfig['messagePrefix']       = '[release] '
 
 # Basic product configuration
 #  Names for the product/files
 releaseConfig['productName']         = 'thunderbird'
+releaseConfig['stage_product']       = 'thunderbird'
 releaseConfig['appName']             = 'mail'
 releaseConfig['mozilla_dir']         = 'mozilla'
 releaseConfig['mozilla_srcdir']      = 'mozilla'
 #  Current version info
 releaseConfig['version']             = '31.1.1'
 releaseConfig['appVersion']          = '31.1.1'
 releaseConfig['milestone']           = releaseConfig['appVersion']
 releaseConfig['buildNumber']         = 1
@@ -134,9 +135,9 @@ releaseConfig['partnersRepoPath']    = '
 # Tuxedo/Bouncer configuration
 releaseConfig['tuxedoServerUrl']     = 'https://bounceradmin.mozilla.com/api'
 releaseConfig['bouncer_submitter_config'] = 'releases/bouncer_thunderbird.py'
 
 # Misc configuration
 releaseConfig['enable_repo_setup'] = False
 releaseConfig['use_mock'] = True
 releaseConfig['mock_platforms'] = ('linux','linux64')
-releaseConfig['ftpSymlinkName'] = 'latest'
\ No newline at end of file
+releaseConfig['ftpSymlinkName'] = 'latest'
--- a/mozilla/release-thunderbird-comm-esr31.py.template
+++ b/mozilla/release-thunderbird-comm-esr31.py.template
@@ -13,16 +13,17 @@ releaseConfig['AllRecipients']       = [
 releaseConfig['ImportantRecipients'] = ['<thunderbird-drivers@mozilla.org>',]
 releaseConfig['AVVendorsRecipients'] = ['<av-vendor-release-announce@mozilla.org>',]
 releaseConfig['releaseTemplates']    = 'release_templates'
 releaseConfig['messagePrefix']       = '[release] '
 
 # Basic product configuration
 #  Names for the product/files
 releaseConfig['productName']         = 'thunderbird'
+releaseConfig['stage_product']       = 'thunderbird'
 releaseConfig['appName']             = 'mail'
 releaseConfig['mozilla_dir']         = 'mozilla'
 releaseConfig['mozilla_srcdir']      = 'mozilla'
 #  Current version info
 releaseConfig['version']             = '{{ version }}'
 releaseConfig['appVersion']          = '{{ appVersion }}'
 releaseConfig['milestone']           = releaseConfig['appVersion']
 releaseConfig['buildNumber']         = {{ buildNumber }}
--- a/mozilla/staging_release-fennec-mozilla-beta.py
+++ b/mozilla/staging_release-fennec-mozilla-beta.py
@@ -14,16 +14,17 @@ releaseConfig['base_clobber_url'] = 'htt
 releaseConfig['AllRecipients']       = EMAIL_RECIPIENTS
 releaseConfig['ImportantRecipients'] = EMAIL_RECIPIENTS
 releaseConfig['releaseTemplates']    = 'release_templates'
 releaseConfig['messagePrefix']       = '[staging-release] '
 
 # Basic product configuration
 #  Names for the product/files
 releaseConfig['productName']         = 'fennec'
+releaseConfig['stage_product']       = 'mobile'
 releaseConfig['appName']             = 'mobile'
 releaseConfig['relbranchPrefix']     = 'MOBILE'
 #  Current version info
 releaseConfig['version']             = '15.0b4'
 releaseConfig['appVersion']          = '15.0'
 releaseConfig['milestone']           = releaseConfig['appVersion']
 releaseConfig['buildNumber']         = 1
 releaseConfig['baseTag']             = 'FENNEC_15_0b4'
@@ -113,17 +114,16 @@ releaseConfig['releaseChannel']      = '
 releaseConfig['enable_repo_setup']       = False
 
 # Fennec specific
 releaseConfig['usePrettyNames']           = False
 releaseConfig['disableBouncerEntries']    = True
 releaseConfig['disableStandaloneRepacks'] = True
 releaseConfig['disablePermissionCheck']   = True
 releaseConfig['disableVirusCheck']        = True
-releaseConfig['disablePushToMirrors']     = True
 releaseConfig['enableUpdatePackaging']    = False
 releaseConfig['balrog_api_root']          = None
 
 releaseConfig['single_locale_options'] = {
     'android': [
         '--cfg',
         'single_locale/staging_release_mozilla-beta_android.py',
         '--tag-override', '%s_RELEASE' % releaseConfig['baseTag'],
@@ -148,8 +148,9 @@ releaseConfig['multilocale_config'] = {
 
 # Staging config
 releaseConfig['build_tools_repo_path'] = "users/stage-ffxbld/tools"
 releaseConfig['enableSigningAtBuildTime'] = True
 releaseConfig['enablePartialMarsAtBuildTime'] = False
 releaseConfig['autoGenerateChecksums'] = False
 releaseConfig['use_mock'] = True
 releaseConfig['mock_platforms'] = ('android', 'linux')
+releaseConfig['ftpSymlinkName'] = 'latest-beta'
--- a/mozilla/staging_release-fennec-mozilla-beta.py.template
+++ b/mozilla/staging_release-fennec-mozilla-beta.py.template
@@ -14,16 +14,17 @@ releaseConfig['base_clobber_url'] = 'htt
 releaseConfig['AllRecipients']       = EMAIL_RECIPIENTS
 releaseConfig['ImportantRecipients'] = EMAIL_RECIPIENTS
 releaseConfig['releaseTemplates']    = 'release_templates'
 releaseConfig['messagePrefix']       = '[staging-release] '
 
 # Basic product configuration
 #  Names for the product/files
 releaseConfig['productName']         = 'fennec'
+releaseConfig['stage_product']       = 'mobile'
 releaseConfig['appName']             = 'mobile'
 releaseConfig['relbranchPrefix']     = 'MOBILE'
 #  Current version info
 releaseConfig['version']             = '{{ version }}'
 releaseConfig['appVersion']          = '{{ appVersion }}'
 releaseConfig['milestone']           = releaseConfig['appVersion']
 releaseConfig['buildNumber']         = {{ buildNumber }}
 releaseConfig['baseTag']             = '{{ baseTag }}'
@@ -110,17 +111,16 @@ releaseConfig['releaseChannel']      = '
 releaseConfig['enable_repo_setup']       = False
 
 # Fennec specific
 releaseConfig['usePrettyNames']           = False
 releaseConfig['disableBouncerEntries']    = True
 releaseConfig['disableStandaloneRepacks'] = True
 releaseConfig['disablePermissionCheck']   = True
 releaseConfig['disableVirusCheck']        = True
-releaseConfig['disablePushToMirrors']     = True
 releaseConfig['enableUpdatePackaging']    = False
 releaseConfig['balrog_api_root']          = None
 
 releaseConfig['single_locale_options'] = {
     'android': [
         '--cfg',
         'single_locale/staging_release_mozilla-beta_android.py',
         '--tag-override', '%s_RELEASE' % releaseConfig['baseTag'],
@@ -147,8 +147,9 @@ releaseConfig['multilocale_config'] = {
 
 # Staging config
 releaseConfig['build_tools_repo_path'] = "users/stage-ffxbld/tools"
 releaseConfig['enableSigningAtBuildTime'] = True
 releaseConfig['enablePartialMarsAtBuildTime'] = False
 releaseConfig['autoGenerateChecksums'] = False
 releaseConfig['use_mock'] = True
 releaseConfig['mock_platforms'] = ('android', 'android-x86', 'linux')
+releaseConfig['ftpSymlinkName'] = 'latest-beta'
--- a/mozilla/staging_release-fennec-mozilla-esr31.py
+++ b/mozilla/staging_release-fennec-mozilla-esr31.py
@@ -14,16 +14,17 @@ releaseConfig['base_clobber_url'] = 'htt
 releaseConfig['AllRecipients']       = EMAIL_RECIPIENTS
 releaseConfig['ImportantRecipients'] = EMAIL_RECIPIENTS
 releaseConfig['releaseTemplates']    = 'release_templates'
 releaseConfig['messagePrefix']       = '[staging-release] '
 
 # Basic product configuration
 #  Names for the product/files
 releaseConfig['productName']         = 'fennec'
+releaseConfig['stage_product']       = 'mobile'
 releaseConfig['appName']             = 'mobile'
 releaseConfig['relbranchPrefix']     = 'MOBILE'
 
 # Function for bumping Android Version Code
 # see bug 1040319
 def bumpIntegerInFile(previousContents):
     return str(int(previousContents) + 1)
 
@@ -117,17 +118,16 @@ releaseConfig['releaseChannel']      = '
 releaseConfig['enable_repo_setup']       = False
 
 # Fennec specific
 releaseConfig['usePrettyNames']           = False
 releaseConfig['disableBouncerEntries']    = True
 releaseConfig['disableStandaloneRepacks'] = True
 releaseConfig['disablePermissionCheck']   = True
 releaseConfig['disableVirusCheck']        = True
-releaseConfig['disablePushToMirrors']     = True
 releaseConfig['enableUpdatePackaging']    = False
 releaseConfig['balrog_api_root']          = None
 
 releaseConfig['multilocale_config'] = {
     'platforms': {
         'android-armv6':
             'multi_locale/staging_release_mozilla-esr_android-armv6.json',
     },
--- a/mozilla/staging_release-fennec-mozilla-esr31.py.template
+++ b/mozilla/staging_release-fennec-mozilla-esr31.py.template
@@ -14,16 +14,17 @@ releaseConfig['base_clobber_url'] = 'htt
 releaseConfig['AllRecipients']       = EMAIL_RECIPIENTS
 releaseConfig['ImportantRecipients'] = EMAIL_RECIPIENTS
 releaseConfig['releaseTemplates']    = 'release_templates'
 releaseConfig['messagePrefix']       = '[staging-release] '
 
 # Basic product configuration
 #  Names for the product/files
 releaseConfig['productName']         = 'fennec'
+releaseConfig['stage_product']       = 'mobile'
 releaseConfig['appName']             = 'mobile'
 releaseConfig['relbranchPrefix']     = 'MOBILE'
 
 # Function for bumping Android Version Code
 # see bug 1040319
 def bumpIntegerInFile(previousContents):
     return str(int(previousContents) + 1)
 
@@ -117,17 +118,16 @@ releaseConfig['releaseChannel']      = '
 releaseConfig['enable_repo_setup']       = False
 
 # Fennec specific
 releaseConfig['usePrettyNames']           = False
 releaseConfig['disableBouncerEntries']    = True
 releaseConfig['disableStandaloneRepacks'] = True
 releaseConfig['disablePermissionCheck']   = True
 releaseConfig['disableVirusCheck']        = True
-releaseConfig['disablePushToMirrors']     = True
 releaseConfig['enableUpdatePackaging']    = False
 releaseConfig['balrog_api_root']          = None
 
 releaseConfig['multilocale_config'] = {
     'platforms': {
         'android-armv6':
             'multi_locale/staging_release_mozilla-esr_android-armv6.json',
     },
--- a/mozilla/staging_release-fennec-mozilla-release.py
+++ b/mozilla/staging_release-fennec-mozilla-release.py
@@ -14,16 +14,17 @@ releaseConfig['base_clobber_url'] = 'htt
 releaseConfig['AllRecipients']       = EMAIL_RECIPIENTS
 releaseConfig['ImportantRecipients'] = EMAIL_RECIPIENTS
 releaseConfig['releaseTemplates']    = 'release_templates'
 releaseConfig['messagePrefix']       = '[staging-release] '
 
 # Basic product configuration
 #  Names for the product/files
 releaseConfig['productName']         = 'fennec'
+releaseConfig['stage_product']       = 'mobile'
 releaseConfig['appName']             = 'mobile'
 releaseConfig['relbranchPrefix']     = 'MOBILE'
 #  Current version info
 releaseConfig['version']             = '10.0.2'
 releaseConfig['appVersion']          = releaseConfig['version']
 releaseConfig['milestone']           = releaseConfig['version']
 releaseConfig['buildNumber']         = 1
 releaseConfig['baseTag']             = 'FENNEC_10_0_2'
@@ -121,17 +122,16 @@ releaseConfig['mozconfigs']          = {
 releaseConfig['enable_repo_setup']       = False
 
 # Fennec specific
 releaseConfig['usePrettyNames']           = False
 releaseConfig['disableBouncerEntries']    = True
 releaseConfig['disableStandaloneRepacks'] = True
 releaseConfig['disablePermissionCheck']   = True
 releaseConfig['disableVirusCheck']        = True
-releaseConfig['disablePushToMirrors']     = True
 releaseConfig['enableUpdatePackaging']    = False
 releaseConfig['balrog_api_root']          = None
 
 releaseConfig['single_locale_options'] = {
     'android': [
         '--cfg',
         'single_locale/staging_release_mozilla-release_android.py',
         '--user-repo-override', 'users/stage-ffxbld',
@@ -156,8 +156,9 @@ releaseConfig['multilocale_config'] = {
 
 # Staging config
 releaseConfig['build_tools_repo_path'] = "users/stage-ffxbld/tools"
 releaseConfig['enableSigningAtBuildTime'] = True
 releaseConfig['enablePartialMarsAtBuildTime'] = False
 releaseConfig['autoGenerateChecksums'] = False
 releaseConfig['use_mock'] = True
 releaseConfig['mock_platforms'] = ('android','linux')
+releaseConfig['ftpSymlinkName'] = 'latest'
--- a/mozilla/staging_release-fennec-mozilla-release.py.template
+++ b/mozilla/staging_release-fennec-mozilla-release.py.template
@@ -14,16 +14,17 @@ releaseConfig['base_clobber_url'] = 'htt
 releaseConfig['AllRecipients']       = EMAIL_RECIPIENTS
 releaseConfig['ImportantRecipients'] = EMAIL_RECIPIENTS
 releaseConfig['releaseTemplates']    = 'release_templates'
 releaseConfig['messagePrefix']       = '[staging-release] '
 
 # Basic product configuration
 #  Names for the product/files
 releaseConfig['productName']         = 'fennec'
+releaseConfig['stage_product']       = 'mobile'
 releaseConfig['appName']             = 'mobile'
 releaseConfig['relbranchPrefix']     = 'MOBILE'
 #  Current version info
 releaseConfig['version']             = '{{ version }}'
 releaseConfig['appVersion']          = '{{ appVersion }}'
 releaseConfig['milestone']           = releaseConfig['appVersion']
 releaseConfig['buildNumber']         = {{ buildNumber }}
 releaseConfig['baseTag']             = '{{ baseTag }}'
@@ -117,17 +118,16 @@ releaseConfig['mozconfigs']          = {
 releaseConfig['enable_repo_setup']       = False
 
 # Fennec specific
 releaseConfig['usePrettyNames']           = False
 releaseConfig['disableBouncerEntries']    = True
 releaseConfig['disableStandaloneRepacks'] = True
 releaseConfig['disablePermissionCheck']   = True
 releaseConfig['disableVirusCheck']        = True
-releaseConfig['disablePushToMirrors']     = True
 releaseConfig['enableUpdatePackaging']    = False
 releaseConfig['balrog_api_root']          = None
 
 releaseConfig['single_locale_options'] = {
     'android': [
         '--cfg',
         'single_locale/staging_release_mozilla-release_android.py',
         '--user-repo-override', 'users/stage-ffxbld',
@@ -152,8 +152,9 @@ releaseConfig['multilocale_config'] = {
 
 # Staging config
 releaseConfig['build_tools_repo_path'] = "users/stage-ffxbld/tools"
 releaseConfig['enableSigningAtBuildTime'] = True
 releaseConfig['enablePartialMarsAtBuildTime'] = False
 releaseConfig['autoGenerateChecksums'] = False
 releaseConfig['use_mock'] = True
 releaseConfig['mock_platforms'] = ('android','linux')
+releaseConfig['ftpSymlinkName'] = 'latest'
--- a/mozilla/staging_release-firefox-mozilla-beta.py
+++ b/mozilla/staging_release-firefox-mozilla-beta.py
@@ -16,16 +16,17 @@ releaseConfig['AllRecipients']       = E
 releaseConfig['ImportantRecipients'] = EMAIL_RECIPIENTS
 releaseConfig['AVVendorsRecipients'] = EMAIL_RECIPIENTS
 releaseConfig['releaseTemplates']    = 'release_templates'
 releaseConfig['messagePrefix']       = '[staging-release] '
 
 # Basic product configuration
 #  Names for the product/files
 releaseConfig['productName']         = 'firefox'
+releaseConfig['stage_product']       = 'firefox'
 releaseConfig['appName']             = 'browser'
 #  Current version info
 releaseConfig['version']             = '15.0b4'
 releaseConfig['appVersion']          = '15.0'
 releaseConfig['milestone']           = '15.0'
 releaseConfig['buildNumber']         = 1
 releaseConfig['baseTag']             = 'FIREFOX_15_0b4'
 releaseConfig['partialUpdates']      = {
--- a/mozilla/staging_release-firefox-mozilla-beta.py.template
+++ b/mozilla/staging_release-firefox-mozilla-beta.py.template
@@ -16,16 +16,17 @@ releaseConfig['AllRecipients']       = E
 releaseConfig['ImportantRecipients'] = EMAIL_RECIPIENTS
 releaseConfig['AVVendorsRecipients'] = EMAIL_RECIPIENTS
 releaseConfig['releaseTemplates']    = 'release_templates'
 releaseConfig['messagePrefix']       = '[staging-release] '
 
 # Basic product configuration
 #  Names for the product/files
 releaseConfig['productName']         = 'firefox'
+releaseConfig['stage_product']       = 'firefox'
 releaseConfig['appName']             = 'browser'
 #  Current version info
 releaseConfig['version']             = '{{ version }}'
 releaseConfig['appVersion']          = '{{ appVersion }}'
 releaseConfig['milestone']           = releaseConfig['appVersion']
 releaseConfig['buildNumber']         = {{ buildNumber }}
 releaseConfig['baseTag']             = '{{ baseTag }}'
 releaseConfig['partialUpdates']      = {
--- a/mozilla/staging_release-firefox-mozilla-esr24.py
+++ b/mozilla/staging_release-firefox-mozilla-esr24.py
@@ -16,16 +16,17 @@ releaseConfig['AllRecipients']       = E
 releaseConfig['ImportantRecipients'] = EMAIL_RECIPIENTS
 releaseConfig['AVVendorsRecipients'] = EMAIL_RECIPIENTS
 releaseConfig['releaseTemplates']    = 'release_templates'
 releaseConfig['messagePrefix']       = '[staging-release] '
 
 # Basic product configuration
 #  Names for the product/files
 releaseConfig['productName']         = 'firefox'
+releaseConfig['stage_product']       = 'firefox'
 releaseConfig['appName']             = 'browser'
 #  Current version info
 releaseConfig['version']             = '24.0esr'
 releaseConfig['appVersion']          = '24.0'
 releaseConfig['milestone']           = releaseConfig['appVersion']
 releaseConfig['buildNumber']         = 1
 releaseConfig['baseTag']             = 'FIREFOX_24_0esr'
 releaseConfig['partialUpdates']      = {}  # TODO for 24.0.1esr
--- a/mozilla/staging_release-firefox-mozilla-esr24.py.template
+++ b/mozilla/staging_release-firefox-mozilla-esr24.py.template
@@ -16,16 +16,17 @@ releaseConfig['AllRecipients']       = E
 releaseConfig['ImportantRecipients'] = EMAIL_RECIPIENTS
 releaseConfig['AVVendorsRecipients'] = EMAIL_RECIPIENTS
 releaseConfig['releaseTemplates']    = 'release_templates'
 releaseConfig['messagePrefix']       = '[staging-release] '
 
 # Basic product configuration
 #  Names for the product/files
 releaseConfig['productName']         = 'firefox'
+releaseConfig['stage_product']       = 'firefox'
 releaseConfig['appName']             = 'browser'
 #  Current version info
 releaseConfig['version']             = '{{ version }}'
 releaseConfig['appVersion']          = '{{ appVersion }}'
 releaseConfig['milestone']           = releaseConfig['appVersion']
 releaseConfig['buildNumber']         = {{ buildNumber }}
 releaseConfig['baseTag']             = '{{ baseTag }}'
 releaseConfig['partialUpdates']      = {
--- a/mozilla/staging_release-firefox-mozilla-esr31.py
+++ b/mozilla/staging_release-firefox-mozilla-esr31.py
@@ -16,16 +16,17 @@ releaseConfig['AllRecipients']       = E
 releaseConfig['ImportantRecipients'] = EMAIL_RECIPIENTS
 releaseConfig['AVVendorsRecipients'] = EMAIL_RECIPIENTS
 releaseConfig['releaseTemplates']    = 'release_templates'
 releaseConfig['messagePrefix']       = '[staging-release] '
 
 # Basic product configuration
 #  Names for the product/files
 releaseConfig['productName']         = 'firefox'
+releaseConfig['stage_product']       = 'firefox'
 releaseConfig['appName']             = 'browser'
 #  Current version info
 releaseConfig['version']             = '31.0esr'
 releaseConfig['appVersion']          = '31.0'
 releaseConfig['milestone']           = releaseConfig['appVersion']
 releaseConfig['buildNumber']         = 1
 releaseConfig['baseTag']             = 'FIREFOX_31_0esr'
 releaseConfig['partialUpdates']      = {}  # TODO for 31.0.1esr
--- a/mozilla/staging_release-firefox-mozilla-esr31.py.template
+++ b/mozilla/staging_release-firefox-mozilla-esr31.py.template
@@ -16,16 +16,17 @@ releaseConfig['AllRecipients']       = E
 releaseConfig['ImportantRecipients'] = EMAIL_RECIPIENTS
 releaseConfig['AVVendorsRecipients'] = EMAIL_RECIPIENTS
 releaseConfig['releaseTemplates']    = 'release_templates'
 releaseConfig['messagePrefix']       = '[staging-release] '
 
 # Basic product configuration
 #  Names for the product/files
 releaseConfig['productName']         = 'firefox'
+releaseConfig['stage_product']       = 'firefox'
 releaseConfig['appName']             = 'browser'
 #  Current version info
 releaseConfig['version']             = '{{ version }}'
 releaseConfig['appVersion']          = '{{ appVersion }}'
 releaseConfig['milestone']           = releaseConfig['appVersion']
 releaseConfig['buildNumber']         = {{ buildNumber }}
 releaseConfig['baseTag']             = '{{ baseTag }}'
 releaseConfig['partialUpdates']      = {
--- a/mozilla/staging_release-firefox-mozilla-release.py
+++ b/mozilla/staging_release-firefox-mozilla-release.py
@@ -16,16 +16,17 @@ releaseConfig['AllRecipients']       = E
 releaseConfig['ImportantRecipients'] = EMAIL_RECIPIENTS
 releaseConfig['AVVendorsRecipients'] = EMAIL_RECIPIENTS
 releaseConfig['releaseTemplates']    = 'release_templates'
 releaseConfig['messagePrefix']       = '[staging-release] '
 
 # Basic product configuration
 #  Names for the product/files
 releaseConfig['productName']         = 'firefox'
+releaseConfig['stage_product']       = 'firefox'
 releaseConfig['appName']             = 'browser'
 #  Current version info
 releaseConfig['version']             = '9.0'
 releaseConfig['appVersion']          = releaseConfig['version']
 releaseConfig['milestone']           = releaseConfig['version']
 releaseConfig['buildNumber']         = 1
 releaseConfig['baseTag']             = 'FIREFOX_9_0'
 releaseConfig['partialUpdates']      = {
--- a/mozilla/staging_release-firefox-mozilla-release.py.template
+++ b/mozilla/staging_release-firefox-mozilla-release.py.template
@@ -16,16 +16,17 @@ releaseConfig['AllRecipients']       = E
 releaseConfig['ImportantRecipients'] = EMAIL_RECIPIENTS
 releaseConfig['AVVendorsRecipients'] = EMAIL_RECIPIENTS
 releaseConfig['releaseTemplates']    = 'release_templates'
 releaseConfig['messagePrefix']       = '[staging-release] '
 
 # Basic product configuration
 #  Names for the product/files
 releaseConfig['productName']         = 'firefox'
+releaseConfig['stage_product']       = 'firefox'
 releaseConfig['appName']             = 'browser'
 #  Current version info
 releaseConfig['version']             = '{{ version }}'
 releaseConfig['appVersion']          = '{{ appVersion }}'
 releaseConfig['milestone']           = releaseConfig['appVersion']
 releaseConfig['buildNumber']         = {{ buildNumber }}
 releaseConfig['baseTag']             = '{{ baseTag }}'
 releaseConfig['partialUpdates']      = {
--- a/mozilla/staging_release-thunderbird-comm-beta.py
+++ b/mozilla/staging_release-thunderbird-comm-beta.py
@@ -16,16 +16,17 @@ releaseConfig['AllRecipients']       = E
 releaseConfig['ImportantRecipients'] = EMAIL_RECIPIENTS
 releaseConfig['AVVendorsRecipients'] = EMAIL_RECIPIENTS
 releaseConfig['releaseTemplates']    = 'release_templates'
 releaseConfig['messagePrefix']       = '[staging-release] '
 
 # Basic product configuration
 #  Names for the product/files
 releaseConfig['productName']         = 'thunderbird'
+releaseConfig['stage_product']       = 'thunderbird'
 releaseConfig['appName']             = 'mail'
 # MERGE DAY (remove this code once comm-beta no longer services Gecko 33 and lower)
 releaseConfig['mozilla_dir']         = 'mozilla'
 #  Current version info
 releaseConfig['version']             = '18.0b1'
 releaseConfig['appVersion']          = '18.0'
 releaseConfig['milestone']           = releaseConfig['appVersion']
 releaseConfig['buildNumber']         = 1
--- a/mozilla/staging_release-thunderbird-comm-beta.py.template
+++ b/mozilla/staging_release-thunderbird-comm-beta.py.template
@@ -16,16 +16,17 @@ releaseConfig['AllRecipients']       = E
 releaseConfig['ImportantRecipients'] = EMAIL_RECIPIENTS
 releaseConfig['AVVendorsRecipients'] = EMAIL_RECIPIENTS
 releaseConfig['releaseTemplates']    = 'release_templates'
 releaseConfig['messagePrefix']       = '[staging-release] '
 
 # Basic product configuration
 #  Names for the product/files
 releaseConfig['productName']         = 'thunderbird'
+releaseConfig['stage_product']       = 'thunderbird'
 releaseConfig['appName']             = 'mail'
 # MERGE DAY (remove this code once comm-beta no longer services Gecko 33 and lower)
 releaseConfig['mozilla_dir']         = 'mozilla'
 #  Current version info
 releaseConfig['version']             = '{{ version }}'
 releaseConfig['appVersion']          = '{{ appVersion }}'
 releaseConfig['milestone']           = releaseConfig['appVersion']
 releaseConfig['buildNumber']         = {{ buildNumber }}
--- a/mozilla/staging_release-thunderbird-comm-esr24.py
+++ b/mozilla/staging_release-thunderbird-comm-esr24.py
@@ -16,16 +16,17 @@ releaseConfig['AllRecipients']       = E
 releaseConfig['ImportantRecipients'] = EMAIL_RECIPIENTS
 releaseConfig['AVVendorsRecipients'] = EMAIL_RECIPIENTS
 releaseConfig['releaseTemplates']    = 'release_templates'
 releaseConfig['messagePrefix']       = '[staging-release] '
 
 # Basic product configuration
 #  Names for the product/files
 releaseConfig['productName']         = 'thunderbird'
+releaseConfig['stage_product']       = 'thunderbird'
 releaseConfig['appName']             = 'mail'
 releaseConfig['mozilla_dir']         = 'mozilla'
 #  Current version info
 releaseConfig['version']             = '9.0'
 releaseConfig['appVersion']          = releaseConfig['version']
 releaseConfig['milestone']           = releaseConfig['version']
 releaseConfig['buildNumber']         = 1
 releaseConfig['baseTag']             = 'THUNDERBIRD_9_0'
--- a/mozilla/staging_release-thunderbird-comm-esr24.py.template
+++ b/mozilla/staging_release-thunderbird-comm-esr24.py.template
@@ -16,16 +16,17 @@ releaseConfig['AllRecipients']       = E
 releaseConfig['ImportantRecipients'] = EMAIL_RECIPIENTS
 releaseConfig['AVVendorsRecipients'] = EMAIL_RECIPIENTS
 releaseConfig['releaseTemplates']    = 'release_templates'
 releaseConfig['messagePrefix']       = '[staging-release] '
 
 # Basic product configuration
 #  Names for the product/files
 releaseConfig['productName']         = 'thunderbird'
+releaseConfig['stage_product']       = 'thunderbird'
 releaseConfig['appName']             = 'mail'
 releaseConfig['mozilla_dir']         = 'mozilla'
 #  Current version info
 releaseConfig['version']             = '{{ version }}'
 releaseConfig['appVersion']          = '{{ appVersion }}'
 releaseConfig['milestone']           = releaseConfig['appVersion']
 releaseConfig['buildNumber']         = {{ buildNumber }}
 releaseConfig['baseTag']             = '{{ baseTag }}'
--- a/mozilla/staging_release-thunderbird-comm-esr31.py
+++ b/mozilla/staging_release-thunderbird-comm-esr31.py
@@ -16,16 +16,17 @@ releaseConfig['AllRecipients']       = E
 releaseConfig['ImportantRecipients'] = EMAIL_RECIPIENTS
 releaseConfig['AVVendorsRecipients'] = EMAIL_RECIPIENTS
 releaseConfig['releaseTemplates']    = 'release_templates'
 releaseConfig['messagePrefix']       = '[staging-release] '
 
 # Basic product configuration
 #  Names for the product/files
 releaseConfig['productName']         = 'thunderbird'
+releaseConfig['stage_product']       = 'thunderbird'
 releaseConfig['appName']             = 'mail'
 releaseConfig['mozilla_dir']         = 'mozilla'
 #  Current version info
 releaseConfig['version']             = '9.0'
 releaseConfig['appVersion']          = releaseConfig['version']
 releaseConfig['milestone']           = releaseConfig['version']
 releaseConfig['buildNumber']         = 1
 releaseConfig['baseTag']             = 'THUNDERBIRD_9_0'
--- a/mozilla/staging_release-thunderbird-comm-esr31.py.template
+++ b/mozilla/staging_release-thunderbird-comm-esr31.py.template
@@ -16,16 +16,17 @@ releaseConfig['AllRecipients']       = E
 releaseConfig['ImportantRecipients'] = EMAIL_RECIPIENTS
 releaseConfig['AVVendorsRecipients'] = EMAIL_RECIPIENTS
 releaseConfig['releaseTemplates']    = 'release_templates'
 releaseConfig['messagePrefix']       = '[staging-release] '
 
 # Basic product configuration
 #  Names for the product/files
 releaseConfig['productName']         = 'thunderbird'
+releaseConfig['stage_product']       = 'thunderbird'
 releaseConfig['appName']             = 'mail'
 releaseConfig['mozilla_dir']         = 'mozilla'
 #  Current version info
 releaseConfig['version']             = '{{ version }}'
 releaseConfig['appVersion']          = '{{ appVersion }}'
 releaseConfig['milestone']           = releaseConfig['appVersion']
 releaseConfig['buildNumber']         = {{ buildNumber }}
 releaseConfig['baseTag']             = '{{ baseTag }}'