--- a/mozilla/release-firefox-mozilla-release.py
+++ b/mozilla/release-firefox-mozilla-release.py
@@ -4,73 +4,70 @@
# 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'
# Release Notification
-releaseConfig['AllRecipients'] = ['<release+releasespam@mozilla.com>',
- '<release-automation-notifications@mozilla.com>',
- '<qa-drivers@mozilla.com>']
+releaseConfig['AllRecipients'] = ['<release-automation-notifications@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'] = '36.0.1'
-releaseConfig['appVersion'] = '36.0.1'
+releaseConfig['version'] = '36.0.3'
+releaseConfig['appVersion'] = '36.0.3'
releaseConfig['milestone'] = releaseConfig['appVersion']
-releaseConfig['buildNumber'] = 2
-releaseConfig['baseTag'] = 'FIREFOX_36_0_1'
+releaseConfig['buildNumber'] = 1
+releaseConfig['baseTag'] = 'FIREFOX_36_0_3'
releaseConfig['partialUpdates'] = {
- '35.0': {
- 'appVersion': '35.0',
- 'buildNumber': 3,
- 'baseTag': 'FIREFOX_35_0',
+ '36.0.1': {
+ 'appVersion': '36.0.1',
+ 'buildNumber': 2,
+ 'baseTag': 'FIREFOX_36_0_1',
},
'35.0.1': {
'appVersion': '35.0.1',
'buildNumber': 1,
'baseTag': 'FIREFOX_35_0_1',
},
'36.0': {
'appVersion': '36.0',
'buildNumber': 2,
'baseTag': 'FIREFOX_36_0',
},
}
-releaseConfig['extraPartials'] = {
-}
-# What's New Page for Hello TODO: remove on request
-releaseConfig['openURL'] = 'https://www.mozilla.org/%LOCALE%/firefox/36.0.1/whatsnew/?oldversion=%OLD_VERSION%'
+# What's New Page for https://bugzilla.mozilla.org/show_bug.cgi?id=1133579.
+# TODO: Remove upon request. Should be revisited with each release.
+releaseConfig['openURL'] = 'https://www.mozilla.org/%LOCALE%/firefox/36.0.3/whatsnew/?oldversion=%OLD_VERSION%'
# TODO: set this properly when we start shipping win64 on release
#releaseConfig['HACK_first_released_version'] = {'win64': TBD}
# Next (nightly) version info
releaseConfig['nextAppVersion'] = releaseConfig['appVersion']
releaseConfig['nextMilestone'] = releaseConfig['milestone']
# Repository configuration, for tagging
releaseConfig['sourceRepositories'] = {
'mozilla': {
'name': 'mozilla-release',
'path': 'releases/mozilla-release',
- 'revision': '1bf1bdefeae0',
+ 'revision': 'd5a003cc284a',
'relbranch': None,
'bumpFiles': {
'browser/config/version.txt': {
'version': releaseConfig['appVersion'],
'nextVersion': releaseConfig['nextAppVersion']
},
'config/milestone.txt': {
'version': releaseConfig['milestone'],
@@ -133,20 +130,20 @@ releaseConfig['mozconfigs'] = {
}
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',
#'win64': 'xulrunner/config/mozconfigs/win64/xulrunner',
}
-releaseConfig['releaseChannel'] = 'release'
+releaseConfig["releaseChannel"] = "release"
releaseConfig['updateChannels'] = {
"release": {
- "versionRegex": r"\d+\.\d+(\.\d+)?$",
+ "versionRegex": r"^\d+\.\d+(\.\d+)?$",
"ruleId": 33,
"patcherConfig": "mozRelease-branch-patcher2.cfg",
"localTestChannel": "release-localtest",
"cdnTestChannel": "release-cdntest",
"verifyConfigs": {
"linux": "mozRelease-firefox-linux.cfg",
"linux64": "mozRelease-firefox-linux64.cfg",
"macosx64": "mozRelease-firefox-mac64.cfg",
@@ -159,17 +156,20 @@ releaseConfig['updateChannels'] = {
},
"release-cdntest": {
"ruleId": 57,
},
},
},
"beta": {
"enabled": False,
- "versionRegex": r"\d+\.\d+b\d+$",
+ # For the beta channel, we want to able to provide updates to this
+ # from prior betas or prior RCs that were shipped to the beta channel,
+ # so this regex matches either.
+ "versionRegex": r"^(\d+\.\d+b\d+|%s)$" % releaseConfig["version"].replace(".", "\\."),
"ruleId": 32,
"requiresMirrors": False,
"patcherConfig": "mozBeta-branch-patcher2.cfg",
"localTestChannel": "beta-localtest",
"cdnTestChannel": "beta-cdntest",
"verifyConfigs": {
"linux": "mozBeta-firefox-linux.cfg",
"linux64": "mozBeta-firefox-linux64.cfg",
@@ -191,20 +191,24 @@ releaseConfig['updateChannels'] = {
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'
+# Product details config
+releaseConfig["productDetailsRepo"] = "svn+ssh://ffxbld@svn.mozilla.org/libs/product-details"
+releaseConfig["mozillaComRepo"] = "svn+ssh://ffxbld@svn.mozilla.org/projects/mozilla.com"
+releaseConfig["svnSshKey"] = "/home/cltbld/.ssh/ffxbld_dsa"
+
# 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',
-}
+}
\ No newline at end of file