--- a/mozilla/config.py
+++ b/mozilla/config.py
@@ -2069,16 +2069,20 @@ apply_localconfig(BRANCH_PROJECTS, local
# All branches (not in project_branches) that are to be built MUST be listed here, along with their
# platforms (if different from the default set).
BRANCHES = {
'mozilla-central': {
},
'mozilla-release': {
'branch_projects': []
},
+ 'mozilla-release-34.1': {
+ 'branch_projects': [],
+ 'gecko_version': 34,
+ },
'mozilla-beta': {
'branch_projects': []
},
'mozilla-aurora': {
'branch_projects': []
},
'mozilla-esr31': {
'branch_projects': [],
@@ -2310,16 +2314,19 @@ BRANCHES['mozilla-central']['platforms']
BRANCHES['mozilla-central']['platforms']['win64']['nightly_signing_servers'] = 'nightly-signing'
BRANCHES['mozilla-central']['platforms']['android']['nightly_signing_servers'] = 'nightly-signing'
BRANCHES['mozilla-central']['platforms']['android-armv6']['nightly_signing_servers'] = 'nightly-signing'
BRANCHES['mozilla-central']['platforms']['android-api-9']['nightly_signing_servers'] = 'nightly-signing'
BRANCHES['mozilla-central']['platforms']['android-api-10']['nightly_signing_servers'] = 'nightly-signing'
BRANCHES['mozilla-central']['platforms']['macosx64']['nightly_signing_servers'] = 'nightly-signing'
BRANCHES['mozilla-central']['l10n_extra_configure_args'] = ['--with-macbundlename-prefix=Firefox']
+######## mozilla-release-34.1
+BRANCHES['mozilla-release-34.1']['repo_path'] = 'releases/mozilla-release'
+
######## mozilla-release
BRANCHES['mozilla-release']['repo_path'] = 'releases/mozilla-release'
BRANCHES['mozilla-release']['update_channel'] = 'release'
BRANCHES['mozilla-release']['l10n_repo_path'] = 'releases/l10n/mozilla-release'
BRANCHES['mozilla-release']['enable_weekly_bundle'] = True
BRANCHES['mozilla-release']['start_hour'] = [3]
BRANCHES['mozilla-release']['start_minute'] = [2]
BRANCHES['mozilla-release']['enable_xulrunner'] = Falsenew file mode 100644
--- /dev/null
+++ b/mozilla/l10n-changesets_mozilla-release-34.1
@@ -0,0 +1,91 @@
+ach e24f18f8dc37
+af 0c3fbad0c159
+an f8fe2516c12e
+ar 5f10c334660c
+as 6c46fe8d1535
+ast b0cca0606020
+az ef5fadbef873
+be b4c9f7da6ac6
+bg 53c265a34db2
+bn-BD ab9122b22e7b
+bn-IN 745026e00bf4
+br eb05e37174d7
+bs 8fc6fcbbced3
+ca 7da0f66c7f3b
+cs 9237eaf5798e
+csb 1d7c7a2e3927
+cy f1adf937b63c
+da e67099d10331
+de 7f3abf3f1169
+dsb 49e9608458aa
+el 22b959c9a739
+en-GB 69db561abade
+en-ZA dc86cffac58e
+eo 06f437c31098
+es-AR 5bbeb2abf4d5
+es-CL 1ff2fb1f21c1
+es-ES 6cc2616b258b
+es-MX 1123256ee60d
+et e648ab74fab6
+eu 896464dd28de
+fa 189c4346605f
+ff 3a7e8b393a23
+fi 34dfd8086e4f
+fr 9e0967965822
+fy-NL 101727cbd2db
+ga-IE 4667b5e32db1
+gd 24f8b02cf0ae
+gl 3676dfac7743
+gu-IN 6245b4309461
+he 0215e8791ade
+hi-IN 2cced88d2a9e
+hr 9fd0597650fa
+hsb 6a115e9485b2
+hu 0c7b5d8953ce
+hy-AM 760d076322d2
+id 2d966049d47b
+is 260c1e64326e
+it bba5e4cd2baf
+ja 5620184e145f
+ja-JP-mac efa87cd7b9ad
+kk da4b952f9c16
+km 2574f21377cc
+kn 9cadc67f8934
+ko 6ce118b27aac
+ku a1a811bf17f7
+lij d6d009b4b3e3
+lt 9dd77a07f35a
+lv c9af532ce728
+mai 2238b9975f69
+mk ffdf2a789185
+ml 7beaa1b99a70
+mr f35eb59da5c1
+ms 17c25034aaf5
+nb-NO c871f507c82f
+nl 011bf9ae7d70
+nn-NO b5f267947c9d
+or 3c46cdfd22e5
+pa-IN c641282598a6
+pl c9ab742a0412
+pt-BR b9740732e23b
+pt-PT 556cc7aa7984
+rm c012c0605859
+ro cd2cad15a260
+ru e2ca580787a3
+si 371c4bb15732
+sk fa5165ae1d29
+sl ea423aa22548
+son 6ae008bb2d71
+sq 5183a171ae1a
+sr 3224808916cb
+sv-SE 6b29832df274
+ta ae5faff29ddc
+te 6bd8179262e1
+th 641418e87dd1
+tr 5ac4de73aac7
+uk 15316c48fbaf
+vi b0da05539c22
+xh 7d88d1363dab
+zh-CN b5ac618485cb
+zh-TW 6bd817dd78fa
+zu f3aac54b9951
\ No newline at end of file
new file mode 100644
--- /dev/null
+++ b/mozilla/release-firefox-mozilla-release-34.1.py
@@ -0,0 +1,148 @@
+# ATTENTION:
+# If you are editing the non-template version of this file (eg, doesn't end
+# with .template), your change WILL get overwritten. If you're adding, removing,
+# or changing options as part of release automation changes you should be
+# editing the .template instead. This file should only by edited directly if
+# you're starting a release without Release Kickoff. You have been warned.
+releaseConfig = {}
+releaseConfig['disable_tinderbox_mail'] = True
+releaseConfig['base_clobber_url'] = 'https://api.pub.build.mozilla.org/clobberer/forceclobber'
+
+releaseConfig['skip_updates'] = True
+
+# Release Notification
+releaseConfig['AllRecipients'] = ['<release@mozilla.com>',
+ '<release-mgmt@mozilla.com>',
+ '<qa-drivers@mozilla.com>']
+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'] = '34.1'
+releaseConfig['appVersion'] = '34.1'
+releaseConfig['milestone'] = releaseConfig['appVersion']
+releaseConfig['buildNumber'] = 1
+releaseConfig['baseTag'] = 'FIREFOX_34_1'
+releaseConfig['partialUpdates'] = {
+}
+releaseConfig['extraPartials'] = {
+}
+# Next (nightly) version info
+releaseConfig['nextAppVersion'] = releaseConfig['appVersion']
+releaseConfig['nextMilestone'] = releaseConfig['milestone']
+# Repository configuration, for tagging
+releaseConfig['sourceRepositories'] = {
+ 'mozilla': {
+ 'name': 'mozilla-release-34.1',
+ 'path': 'releases/mozilla-release',
+ 'revision': 'abcdef123456',
+ 'relbranch': None,
+ 'bumpFiles': {
+ 'browser/config/version.txt': {
+ 'version': releaseConfig['appVersion'],
+ 'nextVersion': releaseConfig['nextAppVersion']
+ },
+ 'config/milestone.txt': {
+ 'version': releaseConfig['milestone'],
+ 'nextVersion': releaseConfig['nextMilestone']
+ },
+ }
+ }
+}
+# L10n repositories
+releaseConfig['l10nRelbranch'] = None
+releaseConfig['l10nRepoPath'] = 'releases/l10n/mozilla-release'
+releaseConfig['l10nRevisionFile'] = 'l10n-changesets_mozilla-release-34.1'
+# Support repositories
+releaseConfig['otherReposToTag'] = {
+ 'build/compare-locales': 'RELEASE_AUTOMATION',
+ 'build/buildbot': 'production-0.8',
+ 'build/partner-repacks': 'default',
+ 'build/mozharness': 'production',
+}
+
+# Platform configuration
+releaseConfig['enUSPlatforms'] = ('linux', 'linux64', 'win32', 'macosx64')
+releaseConfig['notifyPlatforms'] = releaseConfig['enUSPlatforms']
+releaseConfig['talosTestPlatforms'] = ()
+releaseConfig['xulrunnerPlatforms'] = releaseConfig['enUSPlatforms']
+
+# Unittests
+releaseConfig['unittestPlatforms'] = ()
+releaseConfig['enableUnittests'] = False
+
+# L10n configuration
+releaseConfig['l10nPlatforms'] = releaseConfig['enUSPlatforms']
+releaseConfig['shippedLocalesPath'] = 'browser/locales/shipped-locales'
+releaseConfig['mergeLocales'] = True
+releaseConfig['l10nUsePymake'] = True
+
+# Mercurial account
+releaseConfig['hgUsername'] = 'ffxbld'
+releaseConfig['hgSshKey'] = '/home/mock_mozilla/.ssh/ffxbld_rsa'
+
+# Update-specific configuration
+releaseConfig['patcherConfig'] = 'mozRelease-34.1-branch-patcher2.cfg'
+releaseConfig['ftpServer'] = 'ftp.mozilla.org'
+releaseConfig['stagingServer'] = 'stage.mozilla.org'
+releaseConfig['bouncerServer'] = 'download.mozilla.org'
+releaseConfig['ausServerUrl'] = 'https://aus3.mozilla.org'
+releaseConfig['ausHost'] = 'aus3-staging.mozilla.org'
+releaseConfig['ausUser'] = 'ffxbld'
+releaseConfig['ausSshKey'] = 'ffxbld_rsa'
+releaseConfig['releaseNotesUrl'] = None
+releaseConfig['testOlderPartials'] = False
+releaseConfig['promptWaitTime'] = None
+releaseConfig['updateVerifyChunks'] = 6
+releaseConfig['verifyConfigs'] = {
+ 'linux': 'mozRelease-34.1-firefox-linux.cfg',
+ 'linux64': 'mozRelease-34.1-firefox-linux64.cfg',
+ 'macosx64': 'mozRelease-34.1-firefox-mac64.cfg',
+ 'win32': 'mozRelease-34.1-firefox-win32.cfg'
+}
+releaseConfig['mozconfigs'] = {
+ 'linux': 'browser/config/mozconfigs/linux32/release',
+ 'linux64': 'browser/config/mozconfigs/linux64/release',
+ 'macosx64': 'browser/config/mozconfigs/macosx-universal/release',
+ 'win32': 'browser/config/mozconfigs/win32/release',
+}
+releaseConfig['xulrunner_mozconfigs'] = {
+ 'linux': 'xulrunner/config/mozconfigs/linux32/xulrunner',
+ 'linux64': 'xulrunner/config/mozconfigs/linux64/xulrunner',
+ 'macosx64': 'xulrunner/config/mozconfigs/macosx-universal/xulrunner',
+ 'win32': 'xulrunner/config/mozconfigs/win32/xulrunner',
+}
+releaseConfig['releaseChannel'] = 'release'
+releaseConfig['releaseChannelRuleIds'] = [] # Still on AUS3
+releaseConfig['localTestChannel'] = 'betatest'
+releaseConfig['cdnTestChannel'] = 'releasetest'
+releaseConfig['testChannelRuleIds'] = [56,57]
+
+# Partner repack configuration
+releaseConfig['doPartnerRepacks'] = True
+releaseConfig['partnersRepoPath'] = 'build/partner-repacks'
+releaseConfig['syncPartnerBundles'] = True
+
+# Tuxedo/Bouncer configuration
+releaseConfig['tuxedoServerUrl'] = 'https://bounceradmin.mozilla.com/api'
+releaseConfig['bouncer_submitter_config'] = 'releases/bouncer_firefox_release.py'
+
+# Misc configuration
+releaseConfig['makeIndexFiles'] = True
+releaseConfig['enable_repo_setup'] = False
+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',
+}new file mode 100644
--- /dev/null
+++ b/mozilla/release-firefox-mozilla-release-34.1.py.template
@@ -0,0 +1,155 @@
+# ATTENTION:
+# If you are editing the non-template version of this file (eg, doesn't end
+# with .template), your change WILL get overwritten. If you're adding, removing,
+# or changing options as part of release automation changes you should be
+# editing the .template instead. This file should only by edited directly if
+# you're starting a release without Release Kickoff. You have been warned.
+releaseConfig = {}
+releaseConfig['disable_tinderbox_mail'] = True
+releaseConfig['base_clobber_url'] = 'https://api.pub.build.mozilla.org/clobberer/forceclobber'
+
+releaseConfig['skip_updates'] = True
+
+# Release Notification
+releaseConfig['AllRecipients'] = ['<release@mozilla.com>',
+ '<release-mgmt@mozilla.com>',
+ '<qa-drivers@mozilla.com>']
+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'] = {
+{% for version, partial in partials.items() %}
+ '{{ version }}': {
+ 'appVersion': '{{ partial['appVersion'] }}',
+ 'buildNumber': {{ partial['buildNumber'] }},
+ 'baseTag': '{{ partial['baseTag'] }}',
+ },
+{% endfor %}
+}
+releaseConfig['extraPartials'] = {
+}
+# Next (nightly) version info
+releaseConfig['nextAppVersion'] = releaseConfig['appVersion']
+releaseConfig['nextMilestone'] = releaseConfig['milestone']
+# Repository configuration, for tagging
+releaseConfig['sourceRepositories'] = {
+ 'mozilla': {
+ 'name': 'mozilla-release-34.1',
+ 'path': '{{ branch }}',
+ 'revision': '{{ mozillaRevision }}',
+ 'relbranch': {% if mozillaRelbranch %}'{{ mozillaRelbranch }}'{% else %}None{% endif %},
+ 'bumpFiles': {
+ 'browser/config/version.txt': {
+ 'version': releaseConfig['appVersion'],
+ 'nextVersion': releaseConfig['nextAppVersion']
+ },
+ 'config/milestone.txt': {
+ 'version': releaseConfig['milestone'],
+ 'nextVersion': releaseConfig['nextMilestone']
+ },
+ }
+ }
+}
+# L10n repositories
+releaseConfig['l10nRelbranch'] = None
+releaseConfig['l10nRepoPath'] = 'releases/l10n/mozilla-release'
+releaseConfig['l10nRevisionFile'] = 'l10n-changesets_mozilla-release-34.1'
+# Support repositories
+releaseConfig['otherReposToTag'] = {
+ 'build/compare-locales': 'RELEASE_AUTOMATION',
+ 'build/buildbot': 'production-0.8',
+ 'build/partner-repacks': 'default',
+ 'build/mozharness': 'production',
+}
+
+# Platform configuration
+releaseConfig['enUSPlatforms'] = ('linux', 'linux64', 'win32', 'macosx64')
+releaseConfig['notifyPlatforms'] = releaseConfig['enUSPlatforms']
+releaseConfig['talosTestPlatforms'] = ()
+releaseConfig['xulrunnerPlatforms'] = releaseConfig['enUSPlatforms']
+
+# Unittests
+releaseConfig['unittestPlatforms'] = ()
+releaseConfig['enableUnittests'] = False
+
+# L10n configuration
+releaseConfig['l10nPlatforms'] = releaseConfig['enUSPlatforms']
+releaseConfig['shippedLocalesPath'] = 'browser/locales/shipped-locales'
+releaseConfig['mergeLocales'] = True
+releaseConfig['l10nUsePymake'] = True
+
+# Mercurial account
+releaseConfig['hgUsername'] = 'ffxbld'
+releaseConfig['hgSshKey'] = '/home/mock_mozilla/.ssh/ffxbld_rsa'
+
+# Update-specific configuration
+releaseConfig['patcherConfig'] = 'mozRelease-34.1-branch-patcher2.cfg'
+releaseConfig['ftpServer'] = 'ftp.mozilla.org'
+releaseConfig['stagingServer'] = 'stage.mozilla.org'
+releaseConfig['bouncerServer'] = 'download.mozilla.org'
+releaseConfig['ausServerUrl'] = 'https://aus3.mozilla.org'
+releaseConfig['ausHost'] = 'aus3-staging.mozilla.org'
+releaseConfig['ausUser'] = 'ffxbld'
+releaseConfig['ausSshKey'] = 'ffxbld_rsa'
+releaseConfig['releaseNotesUrl'] = None
+releaseConfig['testOlderPartials'] = False
+releaseConfig['promptWaitTime'] = {{ promptWaitTime }}
+releaseConfig['updateVerifyChunks'] = 6
+releaseConfig['verifyConfigs'] = {
+ 'linux': 'mozRelease-34.1-firefox-linux.cfg',
+ 'linux64': 'mozRelease-34.1-firefox-linux64.cfg',
+ 'macosx64': 'mozRelease-34.1-firefox-mac64.cfg',
+ 'win32': 'mozRelease-34.1-firefox-win32.cfg'
+}
+releaseConfig['mozconfigs'] = {
+ 'linux': 'browser/config/mozconfigs/linux32/release',
+ 'linux64': 'browser/config/mozconfigs/linux64/release',
+ 'macosx64': 'browser/config/mozconfigs/macosx-universal/release',
+ 'win32': 'browser/config/mozconfigs/win32/release',
+}
+releaseConfig['xulrunner_mozconfigs'] = {
+ 'linux': 'xulrunner/config/mozconfigs/linux32/xulrunner',
+ 'linux64': 'xulrunner/config/mozconfigs/linux64/xulrunner',
+ 'macosx64': 'xulrunner/config/mozconfigs/macosx-universal/xulrunner',
+ 'win32': 'xulrunner/config/mozconfigs/win32/xulrunner',
+}
+releaseConfig['releaseChannel'] = 'release'
+releaseConfig['releaseChannelRuleIds'] = [] # Still on AUS3
+releaseConfig['localTestChannel'] = 'betatest'
+releaseConfig['cdnTestChannel'] = 'releasetest'
+releaseConfig['testChannelRuleIds'] = [56,57]
+
+# Partner repack configuration
+releaseConfig['doPartnerRepacks'] = True
+releaseConfig['partnersRepoPath'] = 'build/partner-repacks'
+releaseConfig['syncPartnerBundles'] = True
+
+# Tuxedo/Bouncer configuration
+releaseConfig['tuxedoServerUrl'] = 'https://bounceradmin.mozilla.com/api'
+releaseConfig['bouncer_submitter_config'] = 'releases/bouncer_firefox_release.py'
+
+# Misc configuration
+releaseConfig['makeIndexFiles'] = True
+releaseConfig['enable_repo_setup'] = False
+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',
+}new file mode 100644
--- /dev/null
+++ b/mozilla/staging_release-firefox-mozilla-release-34.1.py
@@ -0,0 +1,159 @@
+# ATTENTION:
+# If you are editing the non-template version of this file (eg, doesn't end
+# with .template), your change WILL get overwritten. If you're adding, removing,
+# or changing options as part of release automation changes you should be
+# editing the .template instead. This file should only by edited directly if
+# you're starting a release without Release Kickoff. You have been warned.
+EMAIL_RECIPIENTS = []
+
+releaseConfig = {}
+releaseConfig['skip_repo_setup'] = True
+releaseConfig['disable_tinderbox_mail'] = True
+releaseConfig['base_clobber_url'] = 'https://api-pub-build.allizom.org/clobberer/forceclobber'
+
+releaseConfig["skip_updates"] = True
+
+# Release Notification
+releaseConfig['AllRecipients'] = EMAIL_RECIPIENTS
+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'] = '32.0.1'
+releaseConfig['appVersion'] = '32.0.1'
+releaseConfig['milestone'] = releaseConfig['appVersion']
+releaseConfig['buildNumber'] = 2
+releaseConfig['baseTag'] = 'FIREFOX_32_0_1'
+releaseConfig['partialUpdates'] = {
+
+ '31.0': {
+ 'appVersion': '31.0',
+ 'buildNumber': 1,
+ 'baseTag': 'FIREFOX_31_0',
+ },
+
+}
+# 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'] = {
+ 'mozilla': {
+ 'name': 'mozilla-release-34.1',
+ 'clonePath': 'releases/mozilla-release',
+ 'path': 'users/stage-ffxbld/mozilla-release',
+ 'revision': 'default',
+ 'relbranch': None,
+ 'bumpFiles': {
+ 'browser/config/version.txt': {
+ 'version': releaseConfig['appVersion'],
+ 'nextVersion': releaseConfig['nextAppVersion']
+ },
+ '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_mozilla-release-34.1'
+# 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',
+}
+
+# Platform configuration
+releaseConfig['enUSPlatforms'] = ('linux', 'linux64', 'win32', 'macosx64')
+releaseConfig['notifyPlatforms'] = ('linux', 'linux64', 'win32', 'macosx64')
+releaseConfig['talosTestPlatforms'] = releaseConfig['enUSPlatforms']
+releaseConfig['xulrunnerPlatforms'] = releaseConfig['enUSPlatforms']
+
+# Unittests
+releaseConfig['unittestPlatforms'] = ()
+releaseConfig['enableUnittests'] = True
+
+# L10n configuration
+releaseConfig['l10nPlatforms'] = releaseConfig['enUSPlatforms']
+releaseConfig['shippedLocalesPath'] = 'browser/locales/shipped-locales'
+releaseConfig['l10nChunks'] = 6
+releaseConfig['mergeLocales'] = True
+releaseConfig['l10nUsePymake'] = True
+
+# Mercurial account
+releaseConfig['hgUsername'] = 'stage-ffxbld'
+releaseConfig['hgSshKey'] = '/home/mock_mozilla/.ssh/ffxbld_rsa'
+
+# Update-specific configuration
+releaseConfig['patcherConfig'] = 'mozRelease-34.1-branch-patcher2.cfg'
+releaseConfig['ftpServer'] = 'dev-stage01.srv.releng.scl3.mozilla.com'
+releaseConfig['stagingServer'] = 'dev-stage01.srv.releng.scl3.mozilla.com'
+releaseConfig['previousReleasesStagingServer'] = 'stage.mozilla.org'
+releaseConfig['bouncerServer'] = 'download.mozilla.org'
+releaseConfig['ausServerUrl'] = 'http://dev-stage01.srv.releng.scl3.mozilla.com'
+releaseConfig['ausHost'] = 'dev-stage01.srv.releng.scl3.mozilla.com'
+releaseConfig['ausUser'] = 'ffxbld'
+releaseConfig['ausSshKey'] = 'ffxbld_rsa'
+releaseConfig['releaseNotesUrl'] = None
+releaseConfig['testOlderPartials'] = False
+releaseConfig['promptWaitTime'] = None
+releaseConfig['verifyConfigs'] = {
+ 'linux': 'mozRelease-34.1-firefox-linux.cfg',
+ 'linux64': 'mozRelease-34.1-firefox-linux64.cfg',
+ 'macosx64': 'mozRelease-34.1-firefox-mac64.cfg',
+ 'win32': 'mozRelease-34.1-firefox-win32.cfg'
+}
+releaseConfig['mozconfigs'] = {
+ 'linux': 'browser/config/mozconfigs/linux32/release',
+ 'linux64': 'browser/config/mozconfigs/linux64/release',
+ 'macosx64': 'browser/config/mozconfigs/macosx-universal/release',
+ 'win32': 'browser/config/mozconfigs/win32/release',
+}
+releaseConfig['xulrunner_mozconfigs'] = {
+ 'linux': 'xulrunner/config/mozconfigs/linux32/release',
+ 'linux64': 'xulrunner/config/mozconfigs/linux64/release',
+ 'macosx64': 'xulrunner/config/mozconfigs/macosx-universal/release',
+ 'win32': 'xulrunner/config/mozconfigs/win32/release',
+}
+releaseConfig['releaseChannel'] = 'release'
+releaseConfig['releaseChannelRuleIds'] = [31]
+releaseConfig['localTestChannel'] = 'betatest'
+releaseConfig['cdnTestChannel'] = 'releasetest'
+releaseConfig['testChannelRuleIds'] = [19,20]
+
+# Partner repack configuration
+releaseConfig['doPartnerRepacks'] = True
+releaseConfig['partnersRepoPath'] = 'users/stage-ffxbld/partner-repacks'
+releaseConfig['syncPartnerBundles'] = True
+
+# Tuxedo/Bouncer configuration
+releaseConfig['tuxedoServerUrl'] = 'https://bounceradmin.allizom.org/api'
+releaseConfig['bouncer_submitter_config'] = 'releases/bouncer_firefox_release.py'
+
+# Misc configuration
+releaseConfig['makeIndexFiles'] = True
+releaseConfig['enable_repo_setup'] = False
+releaseConfig['build_tools_repo_path'] = "users/stage-ffxbld/tools"
+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',
+}new file mode 100644
--- /dev/null
+++ b/mozilla/staging_release-firefox-mozilla-release-34.1.py.template
@@ -0,0 +1,159 @@
+# ATTENTION:
+# If you are editing the non-template version of this file (eg, doesn't end
+# with .template), your change WILL get overwritten. If you're adding, removing,
+# or changing options as part of release automation changes you should be
+# editing the .template instead. This file should only by edited directly if
+# you're starting a release without Release Kickoff. You have been warned.
+EMAIL_RECIPIENTS = ["release@mozilla.com"]
+
+releaseConfig = {}
+releaseConfig['skip_repo_setup'] = True
+releaseConfig['disable_tinderbox_mail'] = True
+releaseConfig['base_clobber_url'] = 'https://api-pub-build.allizom.org/clobberer/forceclobber'
+
+releaseConfig["skip_updates"] = True
+
+# Release Notification
+releaseConfig['AllRecipients'] = EMAIL_RECIPIENTS
+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'] = {
+{% for version, partial in partials.items() %}
+ '{{ version }}': {
+ 'appVersion': '{{ partial['appVersion'] }}',
+ 'buildNumber': {{ partial['buildNumber'] }},
+ 'baseTag': '{{ partial['baseTag'] }}',
+ },
+{% endfor %}
+}
+# 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'] = {
+ 'mozilla': {
+ 'name': 'mozilla-release-34.1',
+ 'clonePath': 'releases/mozilla-release',
+ 'path': '{{ branch }}',
+ 'revision': '{{ mozillaRevision }}',
+ 'relbranch': {% if mozillaRelbranch %}'{{ mozillaRelbranch }}'{% else %}None{% endif %},
+ 'bumpFiles': {
+ 'browser/config/version.txt': {
+ 'version': releaseConfig['appVersion'],
+ 'nextVersion': releaseConfig['nextAppVersion']
+ },
+ '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_mozilla-release-34.1'
+# 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',
+}
+
+# Platform configuration
+releaseConfig['enUSPlatforms'] = ('linux', 'linux64', 'win32', 'macosx64')
+releaseConfig['notifyPlatforms'] = ('linux', 'linux64', 'win32', 'macosx64')
+releaseConfig['talosTestPlatforms'] = ()
+releaseConfig['xulrunnerPlatforms'] = releaseConfig['enUSPlatforms']
+
+# Unittests
+releaseConfig['unittestPlatforms'] = ()
+releaseConfig['enableUnittests'] = False
+
+# L10n configuration
+releaseConfig['l10nPlatforms'] = releaseConfig['enUSPlatforms']
+releaseConfig['shippedLocalesPath'] = 'browser/locales/shipped-locales'
+releaseConfig['l10nChunks'] = 6
+releaseConfig['mergeLocales'] = True
+releaseConfig['l10nUsePymake'] = True
+
+# Mercurial account
+releaseConfig['hgUsername'] = 'stage-ffxbld'
+releaseConfig['hgSshKey'] = '/home/mock_mozilla/.ssh/ffxbld_rsa'
+
+# Update-specific configuration
+releaseConfig['patcherConfig'] = 'mozRelease-branch-patcher2.cfg'
+releaseConfig['ftpServer'] = 'dev-stage01.srv.releng.scl3.mozilla.com'
+releaseConfig['stagingServer'] = 'dev-stage01.srv.releng.scl3.mozilla.com'
+releaseConfig['previousReleasesStagingServer'] = 'stage.mozilla.org'
+releaseConfig['bouncerServer'] = 'download.mozilla.org'
+releaseConfig['ausServerUrl'] = 'http://dev-stage01.srv.releng.scl3.mozilla.com'
+releaseConfig['ausHost'] = 'dev-stage01.srv.releng.scl3.mozilla.com'
+releaseConfig['ausUser'] = 'ffxbld'
+releaseConfig['ausSshKey'] = 'ffxbld_rsa'
+releaseConfig['releaseNotesUrl'] = None
+releaseConfig['testOlderPartials'] = False
+releaseConfig['promptWaitTime'] = {{ promptWaitTime }}
+releaseConfig['verifyConfigs'] = {
+ 'linux': 'mozRelease-34.1-firefox-linux.cfg',
+ 'linux64': 'mozRelease-34.1-firefox-linux64.cfg',
+ 'macosx64': 'mozRelease-34.1-firefox-mac64.cfg',
+ 'win32': 'mozRelease-34.1-firefox-win32.cfg'
+}
+releaseConfig['mozconfigs'] = {
+ 'linux': 'browser/config/mozconfigs/linux32/release',
+ 'linux64': 'browser/config/mozconfigs/linux64/release',
+ 'macosx64': 'browser/config/mozconfigs/macosx-universal/release',
+ 'win32': 'browser/config/mozconfigs/win32/release',
+}
+releaseConfig['xulrunner_mozconfigs'] = {
+ 'linux': 'xulrunner/config/mozconfigs/linux32/release',
+ 'linux64': 'xulrunner/config/mozconfigs/linux64/release',
+ 'macosx64': 'xulrunner/config/mozconfigs/macosx-universal/release',
+ 'win32': 'xulrunner/config/mozconfigs/win32/release',
+}
+releaseConfig['releaseChannel'] = 'release'
+releaseConfig['releaseChannelRuleIds'] = [31]
+releaseConfig['localTestChannel'] = 'betatest'
+releaseConfig['cdnTestChannel'] = 'releasetest'
+releaseConfig['testChannelRuleIds'] = [19,20]
+
+# Partner repack configuration
+releaseConfig['doPartnerRepacks'] = True
+releaseConfig['partnersRepoPath'] = 'users/stage-ffxbld/partner-repacks'
+releaseConfig['syncPartnerBundles'] = True
+
+# Tuxedo/Bouncer configuration
+releaseConfig['tuxedoServerUrl'] = 'https://bounceradmin.allizom.org/api'
+releaseConfig['bouncer_submitter_config'] = 'releases/bouncer_firefox_release.py'
+
+# Misc configuration
+releaseConfig['makeIndexFiles'] = True
+releaseConfig['enable_repo_setup'] = False
+releaseConfig['build_tools_repo_path'] = "users/stage-ffxbld/tools"
+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',
+}--- a/mozilla/staging_release-firefox-mozilla-release.py
+++ b/mozilla/staging_release-firefox-mozilla-release.py
@@ -1,15 +1,15 @@
# ATTENTION:
# If you are editing the non-template version of this file (eg, doesn't end
# with .template), your change WILL get overwritten. If you're adding, removing,
# or changing options as part of release automation changes you should be
# editing the .template instead. This file should only by edited directly if
# you're starting a release without Release Kickoff. You have been warned.
-EMAIL_RECIPIENTS = []
+EMAIL_RECIPIENTS = ["release@mozilla.com"]
releaseConfig = {}
releaseConfig['skip_repo_setup'] = True
releaseConfig['disable_tinderbox_mail'] = True
releaseConfig['base_clobber_url'] = 'https://api-pub-build.allizom.org/clobberer/forceclobber'
# Release Notification
releaseConfig['AllRecipients'] = EMAIL_RECIPIENTS
@@ -19,27 +19,27 @@ releaseConfig['releaseTemplates'] = '
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'] = '32.0.1'
-releaseConfig['appVersion'] = '32.0.1'
+releaseConfig['version'] = '34.0'
+releaseConfig['appVersion'] = '34.0'
releaseConfig['milestone'] = releaseConfig['appVersion']
-releaseConfig['buildNumber'] = 2
-releaseConfig['baseTag'] = 'FIREFOX_32_0_1'
+releaseConfig['buildNumber'] = 1
+releaseConfig['baseTag'] = 'FIREFOX_34_0'
releaseConfig['partialUpdates'] = {
- '31.0': {
- 'appVersion': '31.0',
- 'buildNumber': 1,
- 'baseTag': 'FIREFOX_31_0',
+ '33.1': {
+ 'appVersion': '33.1',
+ 'buildNumber': 3,
+ 'baseTag': 'FIREFOX_33_1',
},
}
# Next (nightly) version info
releaseConfig['nextAppVersion'] = releaseConfig['appVersion']
releaseConfig['nextMilestone'] = releaseConfig['milestone']
# Repository configuration, for tagging
## Staging repository path
@@ -74,33 +74,33 @@ releaseConfig['otherReposToTag'] = {
'users/stage-ffxbld/buildbot': 'production-0.8',
'users/stage-ffxbld/partner-repacks': 'default',
'users/stage-ffxbld/mozharness': 'production',
}
# Platform configuration
releaseConfig['enUSPlatforms'] = ('linux', 'linux64', 'win32', 'macosx64')
releaseConfig['notifyPlatforms'] = ('linux', 'linux64', 'win32', 'macosx64')
-releaseConfig['talosTestPlatforms'] = releaseConfig['enUSPlatforms']
+releaseConfig['talosTestPlatforms'] = ()
releaseConfig['xulrunnerPlatforms'] = releaseConfig['enUSPlatforms']
# Unittests
releaseConfig['unittestPlatforms'] = ()
-releaseConfig['enableUnittests'] = True
+releaseConfig['enableUnittests'] = False
# L10n configuration
releaseConfig['l10nPlatforms'] = releaseConfig['enUSPlatforms']
releaseConfig['shippedLocalesPath'] = 'browser/locales/shipped-locales'
releaseConfig['l10nChunks'] = 6
releaseConfig['mergeLocales'] = True
releaseConfig['l10nUsePymake'] = True
# Mercurial account
releaseConfig['hgUsername'] = 'stage-ffxbld'
-releaseConfig['hgSshKey'] = '/home/mock_mozilla/.ssh/ffxbld_rsa'
+releaseConfig['hgSshKey'] = '~cltbld/.ssh/ffxbld_rsa'
# Update-specific configuration
releaseConfig['patcherConfig'] = 'mozRelease-branch-patcher2.cfg'
releaseConfig['ftpServer'] = 'dev-stage01.srv.releng.scl3.mozilla.com'
releaseConfig['stagingServer'] = 'dev-stage01.srv.releng.scl3.mozilla.com'
releaseConfig['previousReleasesStagingServer'] = 'stage.mozilla.org'
releaseConfig['bouncerServer'] = 'download.mozilla.org'
releaseConfig['ausServerUrl'] = 'http://dev-stage01.srv.releng.scl3.mozilla.com'--- a/mozilla/staging_release-firefox-mozilla-release.py.template
+++ b/mozilla/staging_release-firefox-mozilla-release.py.template
@@ -1,15 +1,15 @@
# ATTENTION:
# If you are editing the non-template version of this file (eg, doesn't end
# with .template), your change WILL get overwritten. If you're adding, removing,
# or changing options as part of release automation changes you should be
# editing the .template instead. This file should only by edited directly if
# you're starting a release without Release Kickoff. You have been warned.
-EMAIL_RECIPIENTS = []
+EMAIL_RECIPIENTS = ["release@mozilla.com"]
releaseConfig = {}
releaseConfig['skip_repo_setup'] = True
releaseConfig['disable_tinderbox_mail'] = True
releaseConfig['base_clobber_url'] = 'https://api-pub-build.allizom.org/clobberer/forceclobber'
# Release Notification
releaseConfig['AllRecipients'] = EMAIL_RECIPIENTS
@@ -90,17 +90,17 @@ releaseConfig['enableUnittests'] = F
releaseConfig['l10nPlatforms'] = releaseConfig['enUSPlatforms']
releaseConfig['shippedLocalesPath'] = 'browser/locales/shipped-locales'
releaseConfig['l10nChunks'] = 6
releaseConfig['mergeLocales'] = True
releaseConfig['l10nUsePymake'] = True
# Mercurial account
releaseConfig['hgUsername'] = 'stage-ffxbld'
-releaseConfig['hgSshKey'] = '~cltbld/.ssh/ffxbld_rsa'
+releaseConfig['hgSshKey'] = '/home/mock_mozilla/.ssh/ffxbld_rsa'
# Update-specific configuration
releaseConfig['patcherConfig'] = 'mozRelease-branch-patcher2.cfg'
releaseConfig['ftpServer'] = 'dev-stage01.srv.releng.scl3.mozilla.com'
releaseConfig['stagingServer'] = 'dev-stage01.srv.releng.scl3.mozilla.com'
releaseConfig['previousReleasesStagingServer'] = 'stage.mozilla.org'
releaseConfig['bouncerServer'] = 'download.mozilla.org'
releaseConfig['ausServerUrl'] = 'http://dev-stage01.srv.releng.scl3.mozilla.com'new file mode 100644
--- /dev/null
+++ b/mozilla2/linux/mozilla-release-34.1/release/mozconfig
@@ -0,0 +1,33 @@
+ac_add_options --enable-application=browser
+ac_add_options --enable-update-channel=release
+ac_add_options --enable-update-packaging
+ac_add_options --enable-official-branding
+ac_add_options --with-google-api-keyfile=/builds/gapi.data
+
+CC="/tools/gcc-4.7.3-0moz1/bin/gcc"
+CXX="/tools/gcc-4.7.3-0moz1/bin/g++"
+# Avoid dependency on libstdc++ 4.5
+ac_add_options --enable-stdcxx-compat
+
+# PGO
+mk_add_options MOZ_PGO=1
+
+# Needed to enable breakpad in application.ini
+export MOZILLA_OFFICIAL=1
+
+export MOZ_TELEMETRY_REPORTING=1
+
+# Treat warnings as errors in directories with FAIL_ON_WARNINGS.
+ac_add_options --enable-warnings-as-errors
+
+# Package js shell.
+export MOZ_PACKAGE_JSSHELL=1
+
+if test `uname -m` = "x86_64"; then
+ # -march=pentiumpro is what our 32-bit native toolchain defaults to
+ CC="$CC -m32 -march=pentiumpro"
+ CXX="$CXX -m32 -march=pentiumpro"
+ ac_add_options --target=i686-pc-linux
+ ac_add_options --x-libraries=/usr/lib
+ export PKG_CONFIG_LIBDIR=/usr/lib/pkgconfig:/usr/share/pkgconfig
+fi
