--- a/mozilla/builder_master.cfg
+++ b/mozilla/builder_master.cfg
@@ -108,18 +108,16 @@ if ENABLE_RELEASES:
from buildbotcustom.process.release import generateReleaseBranchObjects
from buildbotcustom.process.release import generateReleasePromotionBuilders
# TODO remove this block when we have completely switched to release promotion
# Bug 1215865 - remove generateReleaseBranchObjects after fully porting to release promotion
for product, sourceRepoKey, productBranches, releaseBranch in \
[('thunderbird', 'comm', THUNDERBIRD_BRANCHES, b)
for b in ACTIVE_THUNDERBIRD_RELEASE_BRANCHES] + \
- [('firefox', 'mozilla', BRANCHES, b)
- for b in ACTIVE_RELEASE_BRANCHES] + \
[('fennec', 'mobile', BRANCHES, b)
for b in ACTIVE_MOBILE_RELEASE_BRANCHES]:
releaseBranchConfig = {}
releaseConfigFile = "release-%s-%s.py" % (product, releaseBranch)
execfile(releaseConfigFile, releaseBranchConfig, releaseBranchConfig)
branchConfig = productBranches[releaseBranchConfig['releaseConfig']['sourceRepositories'][sourceRepoKey]['name']]
releaseObjects = generateReleaseBranchObjects(
releaseBranchConfig['releaseConfig'], branchConfig,
deleted file mode 100644
--- a/mozilla/l10n-changesets_mozilla-beta
+++ /dev/null
@@ -1,90 +0,0 @@
-ach 658769a76613
-af 9e9478085913
-an 6d0c7fdc8e99
-ar b17e34b215fd
-as 8313f975ae77
-ast 0300b60cd340
-az 423585257380
-be b72077740aac
-bg 631b3eaa8646
-bn-BD 487a5f1d2e41
-bn-IN 89b47e7a06e7
-br 573c7eb06ba0
-bs ed89f1d4e38b
-ca e8ca2d46b4a8
-cs f7450a266f73
-cy 71e1b1ef1d84
-da bab2b0ec316f
-de 8972c3dcaccb
-dsb e24f2860f362
-el 22b959c9a739
-en-GB a93096b441eb
-en-ZA 720d9153b07b
-eo 3580a6a87605
-es-AR 0061be317170
-es-CL b147900a2459
-es-ES c4e260551e58
-es-MX 18adcb0a2576
-et 2682678ed2ea
-eu 7cb1c2c152a6
-fa 676738495694
-ff 8373353b43c4
-fi e5da5ef48695
-fr 64fc9718cb3d
-fy-NL 71f4645dfde9
-ga-IE e1e4efd1d4bf
-gd ec0f3dc0046a
-gl c869caff337a
-gn 9846a32f9c8f
-gu-IN 6245b4309461
-he ee92b661d299
-hi-IN bba2a926e4f8
-hr 48f56e5fd227
-hsb 6d5e913bc0f5
-hu ac69bdda416c
-hy-AM b2c2db63dab8
-id 498881006842
-is fa0da095f651
-it 6644e67fa742
-ja f70b8d555701
-ja-JP-mac 9ed37bbe9e65
-kk a69f24844a8d
-km 339790840ac1
-kn 5ab48195d828
-ko 413e47793ca6
-lij e9113fac3a93
-lt 8fe273451c58
-lv 5b814b0d4590
-mai ce010a305377
-mk ffdf2a789185
-ml d80bce9f9e33
-mr 1155a67cf6e6
-ms 41bbf86ac0d9
-nb-NO 573fc4e4e6ee
-nl c705fac0a601
-nn-NO 6ee5807cb74a
-or febd1b04dbfc
-pa-IN 6c5ed1be55fb
-pl e817b596d9a8
-pt-BR d0052d734bb8
-pt-PT 64720cd60165
-rm 90062051af26
-ro 7e9f8b56a2db
-ru 014f67ca3662
-si 03a3b09a2203
-sk 1db830974b3c
-sl fdfb7cb383dd
-son 8036ea107f58
-sq 9eebb64a1b91
-sr 8e162faaf130
-sv-SE 0cb062a69ead
-ta f9dbc2cca1fb
-te b802f90bd91d
-th 78eea74717b5
-tr 157d6635c74f
-uk 417f6c89aad2
-uz 7987b82ee9c8
-vi 68ce305343a3
-xh 913f5f9c6c6f
-zh-CN 79d0fbf890f9
-zh-TW 32e3bf5e55ff
\ No newline at end of file
deleted file mode 100644
--- a/mozilla/l10n-changesets_mozilla-esr45
+++ /dev/null
@@ -1,90 +0,0 @@
-ach 658769a76613
-af 9e9478085913
-an 6d0c7fdc8e99
-ar b17e34b215fd
-as 8313f975ae77
-ast 0300b60cd340
-az 423585257380
-be b72077740aac
-bg 631b3eaa8646
-bn-BD 487a5f1d2e41
-bn-IN 89b47e7a06e7
-br 573c7eb06ba0
-bs ed89f1d4e38b
-ca e8ca2d46b4a8
-cs f7450a266f73
-cy 71e1b1ef1d84
-da bab2b0ec316f
-de 8972c3dcaccb
-dsb e24f2860f362
-el 22b959c9a739
-en-GB a93096b441eb
-en-ZA 720d9153b07b
-eo 3580a6a87605
-es-AR 0061be317170
-es-CL b147900a2459
-es-ES c4e260551e58
-es-MX 18adcb0a2576
-et 2682678ed2ea
-eu 7cb1c2c152a6
-fa 676738495694
-ff 8373353b43c4
-fi e5da5ef48695
-fr 64fc9718cb3d
-fy-NL 71f4645dfde9
-ga-IE e1e4efd1d4bf
-gd ec0f3dc0046a
-gl c869caff337a
-gn 9846a32f9c8f
-gu-IN 6245b4309461
-he ee92b661d299
-hi-IN bba2a926e4f8
-hr 48f56e5fd227
-hsb 6d5e913bc0f5
-hu ac69bdda416c
-hy-AM b2c2db63dab8
-id 498881006842
-is fa0da095f651
-it 6644e67fa742
-ja f70b8d555701
-ja-JP-mac 9ed37bbe9e65
-kk a69f24844a8d
-km 339790840ac1
-kn 5ab48195d828
-ko 413e47793ca6
-lij e9113fac3a93
-lt 8fe273451c58
-lv 5b814b0d4590
-mai ce010a305377
-mk ffdf2a789185
-ml d80bce9f9e33
-mr 1155a67cf6e6
-ms 41bbf86ac0d9
-nb-NO 573fc4e4e6ee
-nl c705fac0a601
-nn-NO 6ee5807cb74a
-or febd1b04dbfc
-pa-IN 6c5ed1be55fb
-pl e817b596d9a8
-pt-BR d0052d734bb8
-pt-PT 64720cd60165
-rm 90062051af26
-ro 7e9f8b56a2db
-ru 014f67ca3662
-si 03a3b09a2203
-sk 1db830974b3c
-sl fdfb7cb383dd
-son 8036ea107f58
-sq 9eebb64a1b91
-sr 8e162faaf130
-sv-SE 0cb062a69ead
-ta f9dbc2cca1fb
-te b802f90bd91d
-th 78eea74717b5
-tr 157d6635c74f
-uk 417f6c89aad2
-uz 7987b82ee9c8
-vi 68ce305343a3
-xh 913f5f9c6c6f
-zh-CN 79d0fbf890f9
-zh-TW 32e3bf5e55ff
\ No newline at end of file
deleted file mode 100644
--- a/mozilla/l10n-changesets_mozilla-release
+++ /dev/null
@@ -1,90 +0,0 @@
-ach 658769a76613
-af 9e9478085913
-an 6d0c7fdc8e99
-ar b17e34b215fd
-as 8313f975ae77
-ast 0300b60cd340
-az 423585257380
-be b72077740aac
-bg 631b3eaa8646
-bn-BD 487a5f1d2e41
-bn-IN 89b47e7a06e7
-br 573c7eb06ba0
-bs ed89f1d4e38b
-ca e8ca2d46b4a8
-cs f7450a266f73
-cy 71e1b1ef1d84
-da bab2b0ec316f
-de 8972c3dcaccb
-dsb e24f2860f362
-el 22b959c9a739
-en-GB a93096b441eb
-en-ZA 720d9153b07b
-eo 3580a6a87605
-es-AR 0061be317170
-es-CL b147900a2459
-es-ES c4e260551e58
-es-MX 18adcb0a2576
-et 2682678ed2ea
-eu 7cb1c2c152a6
-fa 676738495694
-ff 8373353b43c4
-fi e5da5ef48695
-fr 64fc9718cb3d
-fy-NL 71f4645dfde9
-ga-IE e1e4efd1d4bf
-gd ec0f3dc0046a
-gl c869caff337a
-gn 9846a32f9c8f
-gu-IN 6245b4309461
-he ee92b661d299
-hi-IN bba2a926e4f8
-hr 48f56e5fd227
-hsb 6d5e913bc0f5
-hu ac69bdda416c
-hy-AM b2c2db63dab8
-id 498881006842
-is fa0da095f651
-it 6644e67fa742
-ja f70b8d555701
-ja-JP-mac 9ed37bbe9e65
-kk a69f24844a8d
-km 339790840ac1
-kn 5ab48195d828
-ko 413e47793ca6
-lij e9113fac3a93
-lt 8fe273451c58
-lv 5b814b0d4590
-mai ce010a305377
-mk ffdf2a789185
-ml d80bce9f9e33
-mr 1155a67cf6e6
-ms 41bbf86ac0d9
-nb-NO 573fc4e4e6ee
-nl c705fac0a601
-nn-NO 6ee5807cb74a
-or febd1b04dbfc
-pa-IN 6c5ed1be55fb
-pl e817b596d9a8
-pt-BR d0052d734bb8
-pt-PT 64720cd60165
-rm 90062051af26
-ro 7e9f8b56a2db
-ru 014f67ca3662
-si 03a3b09a2203
-sk 1db830974b3c
-sl fdfb7cb383dd
-son 8036ea107f58
-sq 9eebb64a1b91
-sr 8e162faaf130
-sv-SE 0cb062a69ead
-ta f9dbc2cca1fb
-te b802f90bd91d
-th 78eea74717b5
-tr 157d6635c74f
-uk 417f6c89aad2
-uz 7987b82ee9c8
-vi 68ce305343a3
-xh 913f5f9c6c6f
-zh-CN 79d0fbf890f9
-zh-TW 32e3bf5e55ff
\ No newline at end of file
deleted file mode 100644
--- a/mozilla/release-firefox-mozilla-beta.py
+++ /dev/null
@@ -1,180 +0,0 @@
-# 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['base_clobber_url'] = 'https://api.pub.build.mozilla.org/clobberer/forceclobber'
-
-# Release Notification
-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'] = '45.0b10'
-releaseConfig['appVersion'] = '45.0'
-releaseConfig['milestone'] = releaseConfig['appVersion']
-releaseConfig['buildNumber'] = 1
-releaseConfig['baseTag'] = 'FIREFOX_45_0b10'
-releaseConfig['partialUpdates'] = {
-
- '45.0b9': {
- 'appVersion': '45.0',
- 'buildNumber': 2,
- 'baseTag': 'FIREFOX_45_0b9',
- },
-
- '45.0b8': {
- 'appVersion': '45.0',
- 'buildNumber': 1,
- 'baseTag': 'FIREFOX_45_0b8',
- },
-
- '45.0b6': {
- 'appVersion': '45.0',
- 'buildNumber': 1,
- 'baseTag': 'FIREFOX_45_0b6',
- },
-
-}
-releaseConfig['ui_update_tests'] = False
-
-# win64 support
-releaseConfig['HACK_first_released_version'] = {'win64': '37.0b2'}
-
-# Next (nightly) version info
-releaseConfig['nextAppVersion'] = releaseConfig['appVersion']
-releaseConfig['nextVersion'] = releaseConfig['version']
-releaseConfig['nextMilestone'] = releaseConfig['milestone']
-# Repository configuration, for tagging
-releaseConfig['sourceRepositories'] = {
- 'mozilla': {
- 'name': 'mozilla-beta',
- 'path': 'releases/mozilla-beta',
- 'revision': '3eaf4e1122e7',
- 'relbranch': None,
- 'bumpFiles': {
- 'browser/config/version.txt': {
- 'version': releaseConfig['appVersion'],
- 'nextVersion': releaseConfig['nextAppVersion']
- },
- 'browser/config/version_display.txt': {
- 'version': releaseConfig['version'],
- 'nextVersion': releaseConfig['nextVersion']
- },
- 'config/milestone.txt': {
- 'version': releaseConfig['milestone'],
- 'nextVersion': releaseConfig['nextMilestone']
- },
- }
- }
-}
-# L10n repositories
-releaseConfig['l10nRelbranch'] = None
-releaseConfig['l10nRepoPath'] = 'releases/l10n/mozilla-beta'
-releaseConfig['l10nRevisionFile'] = 'l10n-changesets_mozilla-beta'
-# Support repositories
-releaseConfig['otherReposToTag'] = {
- 'build/compare-locales': 'RELEASE_AUTOMATION',
- 'build/buildbot': 'production-0.8',
-}
-
-# Platform configuration
-releaseConfig['enUSPlatforms'] = ('linux', 'linux64', 'win32', 'macosx64', 'win64')
-releaseConfig['notifyPlatforms'] = releaseConfig['enUSPlatforms']
-releaseConfig['talosTestPlatforms'] = ()
-
-# Unittests
-releaseConfig['unittestPlatforms'] = ()
-releaseConfig['enableUnittests'] = False
-
-# SDK
-releaseConfig['packageSDK'] = True
-
-# 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['ftpServer'] = 'archive.mozilla.org'
-releaseConfig['stagingServer'] = 'upload.ffxbld.productdelivery.prod.mozaws.net'
-releaseConfig['S3Credentials'] = '/builds/release-s3.credentials'
-releaseConfig['S3Bucket'] = 'net-mozaws-prod-delivery-firefox'
-releaseConfig['bouncerServer'] = 'download.mozilla.org'
-releaseConfig['ausServerUrl'] = 'https://aus4.mozilla.org'
-releaseConfig['releaseNotesUrl'] = None
-releaseConfig['testOlderPartials'] = False
-releaseConfig['promptWaitTime'] = None
-releaseConfig['updateVerifyChunks'] = 6
-releaseConfig['mozconfigs'] = {
- 'linux': 'browser/config/mozconfigs/linux32/beta',
- 'linux64': 'browser/config/mozconfigs/linux64/beta',
- 'macosx64': 'browser/config/mozconfigs/macosx-universal/beta',
- 'win32': 'browser/config/mozconfigs/win32/beta',
- 'win64': 'browser/config/mozconfigs/win64/beta',
-}
-releaseConfig['source_mozconfig'] = 'browser/config/mozconfigs/linux64/source'
-releaseConfig['releaseChannel'] = 'beta'
-releaseConfig['updateChannels'] = {
- "beta": {
- "versionRegex": r"^.*$",
- "ruleId": 32,
- "patcherConfig": "mozBeta-branch-patcher2.cfg",
- "localTestChannel": "beta-localtest",
- "cdnTestChannel": "beta-cdntest",
- "verifyConfigs": {
- "linux": "mozBeta-firefox-linux.cfg",
- "linux64": "mozBeta-firefox-linux64.cfg",
- "macosx64": "mozBeta-firefox-mac64.cfg",
- "win32": "mozBeta-firefox-win32.cfg",
- "win64": "mozBeta-firefox-win64.cfg",
- },
- "testChannels": {
- "beta-cdntest": {
- "ruleId": 45,
- },
- "beta-localtest": {
- "ruleId": 25,
- },
- }
- }
-}
-
-# Partner repack configuration
-releaseConfig['doPartnerRepacks'] = True
-releaseConfig['partnerRepackPlatforms'] = releaseConfig['l10nPlatforms']
-releaseConfig['partnerRepackConfig'] = {
- 'use_mozharness': True,
- 'script': 'scripts/desktop_partner_repacks.py',
- 'config_file': 'partner_repacks/release_mozilla-release_desktop.py',
- 's3cfg': '/builds/partners-s3cfg',
-}
-
-# Tuxedo/Bouncer configuration
-releaseConfig['tuxedoServerUrl'] = 'https://bounceradmin.mozilla.com/api'
-releaseConfig['bouncer_submitter_config'] = 'releases/bouncer_firefox_beta.py'
-
-# Misc configuration
-releaseConfig['enableAutomaticPushToMirrors'] = True
-releaseConfig['use_mock'] = True
-releaseConfig['mock_platforms'] = ('linux','linux64')
-
-releaseConfig['bouncer_aliases'] = {
- 'Firefox-%(version)s': 'firefox-beta-latest',
- 'Firefox-%(version)s-stub': 'firefox-beta-stub',
-}
\ No newline at end of file
deleted file mode 100644
--- a/mozilla/release-firefox-mozilla-beta.py.template
+++ /dev/null
@@ -1,168 +0,0 @@
-# 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['base_clobber_url'] = 'https://api.pub.build.mozilla.org/clobberer/forceclobber'
-
-# Release Notification
-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'] = '{{ 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['ui_update_tests'] = False
-
-# win64 support
-releaseConfig['HACK_first_released_version'] = {'win64': '37.0b2'}
-
-# Next (nightly) version info
-releaseConfig['nextAppVersion'] = releaseConfig['appVersion']
-releaseConfig['nextVersion'] = releaseConfig['version']
-releaseConfig['nextMilestone'] = releaseConfig['milestone']
-# Repository configuration, for tagging
-releaseConfig['sourceRepositories'] = {
- 'mozilla': {
- 'name': 'mozilla-beta',
- 'path': '{{ branch }}',
- 'revision': '{{ mozillaRevision }}',
- 'relbranch': {% if mozillaRelbranch %}'{{ mozillaRelbranch }}'{% else %}None{% endif %},
- 'bumpFiles': {
- 'browser/config/version.txt': {
- 'version': releaseConfig['appVersion'],
- 'nextVersion': releaseConfig['nextAppVersion']
- },
- 'browser/config/version_display.txt': {
- 'version': releaseConfig['version'],
- 'nextVersion': releaseConfig['nextVersion']
- },
- 'config/milestone.txt': {
- 'version': releaseConfig['milestone'],
- 'nextVersion': releaseConfig['nextMilestone']
- },
- }
- }
-}
-# L10n repositories
-releaseConfig['l10nRelbranch'] = None
-releaseConfig['l10nRepoPath'] = 'releases/l10n/mozilla-beta'
-releaseConfig['l10nRevisionFile'] = 'l10n-changesets_mozilla-beta'
-# Support repositories
-releaseConfig['otherReposToTag'] = {
- 'build/compare-locales': 'RELEASE_AUTOMATION',
- 'build/buildbot': 'production-0.8',
-}
-
-# Platform configuration
-releaseConfig['enUSPlatforms'] = ('linux', 'linux64', 'win32', 'macosx64', 'win64')
-releaseConfig['notifyPlatforms'] = releaseConfig['enUSPlatforms']
-releaseConfig['talosTestPlatforms'] = ()
-
-# Unittests
-releaseConfig['unittestPlatforms'] = ()
-releaseConfig['enableUnittests'] = False
-
-# SDK
-releaseConfig['packageSDK'] = True
-
-# 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['ftpServer'] = 'archive.mozilla.org'
-releaseConfig['stagingServer'] = 'upload.ffxbld.productdelivery.prod.mozaws.net'
-releaseConfig['S3Credentials'] = '/builds/release-s3.credentials'
-releaseConfig['S3Bucket'] = 'net-mozaws-prod-delivery-firefox'
-releaseConfig['bouncerServer'] = 'download.mozilla.org'
-releaseConfig['ausServerUrl'] = 'https://aus4.mozilla.org'
-releaseConfig['releaseNotesUrl'] = None
-releaseConfig['testOlderPartials'] = False
-releaseConfig['promptWaitTime'] = {{ promptWaitTime }}
-releaseConfig['updateVerifyChunks'] = 6
-releaseConfig['mozconfigs'] = {
- 'linux': 'browser/config/mozconfigs/linux32/beta',
- 'linux64': 'browser/config/mozconfigs/linux64/beta',
- 'macosx64': 'browser/config/mozconfigs/macosx-universal/beta',
- 'win32': 'browser/config/mozconfigs/win32/beta',
- 'win64': 'browser/config/mozconfigs/win64/beta',
-}
-releaseConfig['source_mozconfig'] = 'browser/config/mozconfigs/linux64/source'
-releaseConfig['releaseChannel'] = 'beta'
-releaseConfig['updateChannels'] = {
- "beta": {
- "versionRegex": r"^.*$",
- "ruleId": 32,
- "patcherConfig": "mozBeta-branch-patcher2.cfg",
- "localTestChannel": "beta-localtest",
- "cdnTestChannel": "beta-cdntest",
- "verifyConfigs": {
- "linux": "beta-firefox-linux.cfg",
- "linux64": "beta-firefox-linux64.cfg",
- "macosx64": "beta-firefox-macosx64.cfg",
- "win32": "beta-firefox-win32.cfg",
- "win64": "beta-firefox-win64.cfg",
- },
- "testChannels": {
- "beta-cdntest": {
- "ruleId": 45,
- },
- "beta-localtest": {
- "ruleId": 25,
- },
- }
- }
-}
-
-# Partner repack configuration
-releaseConfig['doPartnerRepacks'] = True
-releaseConfig['partnerRepackPlatforms'] = releaseConfig['l10nPlatforms']
-releaseConfig['partnerRepackConfig'] = {
- 'use_mozharness': True,
- 'script': 'scripts/desktop_partner_repacks.py',
- 'config_file': 'partner_repacks/release_mozilla-release_desktop.py',
- 's3cfg': '/builds/partners-s3cfg',
-}
-
-# Tuxedo/Bouncer configuration
-releaseConfig['tuxedoServerUrl'] = 'https://bounceradmin.mozilla.com/api'
-releaseConfig['bouncer_submitter_config'] = 'releases/bouncer_firefox_beta.py'
-
-# Misc configuration
-releaseConfig['enableAutomaticPushToMirrors'] = True
-releaseConfig['use_mock'] = True
-releaseConfig['mock_platforms'] = ('linux','linux64')
-
-releaseConfig['bouncer_aliases'] = {
- 'Firefox-%(version)s': 'firefox-beta-latest',
- 'Firefox-%(version)s-stub': 'firefox-beta-stub',
-}
deleted file mode 100644
--- a/mozilla/release-firefox-mozilla-esr45.py
+++ /dev/null
@@ -1,160 +0,0 @@
-# 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['base_clobber_url'] = 'https://api.pub.build.mozilla.org/clobberer/forceclobber'
-
-# Release Notification
-releaseConfig['AllRecipients'] = ['<release-automation-notifications@mozilla.com>',]
-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'] = '45.2.0esr'
-releaseConfig['appVersion'] = '45.2.0'
-releaseConfig['milestone'] = releaseConfig['appVersion']
-releaseConfig['buildNumber'] = 1
-releaseConfig['baseTag'] = 'FIREFOX_45_2_0esr'
-releaseConfig['partialUpdates'] = {
-
- '45.1.1esr': {
- 'appVersion': '45.1.1',
- 'buildNumber': 1,
- 'baseTag': 'FIREFOX_45_1_1esr',
- },
-
-}
-
-releaseConfig['HACK_first_released_version'] = {'win64': "45.0"}
-
-# Next (nightly) version info
-releaseConfig['nextAppVersion'] = '45.2.0esrpre'
-releaseConfig['nextMilestone'] = releaseConfig['nextAppVersion']
-# Repository configuration, for tagging
-releaseConfig['sourceRepositories'] = {
- 'mozilla': {
- 'name': 'mozilla-esr45',
- 'path': 'releases/mozilla-esr45',
- 'revision': 'dc190bd03d24',
- 'relbranch': None,
- 'bumpFiles': {
- 'browser/config/version.txt': {
- 'version': releaseConfig['appVersion'],
- 'nextVersion': releaseConfig['nextAppVersion']
- },
- 'browser/config/version_display.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-esr45'
-# Support repositories
-releaseConfig['otherReposToTag'] = {
- 'build/compare-locales': 'RELEASE_0_9_5',
- 'build/buildbot': 'production-0.8',
-}
-
-# Platform configuration
-releaseConfig['enUSPlatforms'] = ('linux', 'linux64', 'macosx64', 'win32', 'win64')
-releaseConfig['notifyPlatforms'] = releaseConfig['enUSPlatforms']
-releaseConfig['talosTestPlatforms'] = ()
-
-# Unittests
-releaseConfig['unittestPlatforms'] = ()
-releaseConfig['enableUnittests'] = False
-
-# SDK
-releaseConfig['packageSDK'] = True
-
-# 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['ftpServer'] = 'archive.mozilla.org'
-releaseConfig['stagingServer'] = 'upload.ffxbld.productdelivery.prod.mozaws.net'
-releaseConfig['S3Credentials'] = '/builds/release-s3.credentials'
-releaseConfig['S3Bucket'] = 'net-mozaws-prod-delivery-firefox'
-releaseConfig['bouncerServer'] = 'download.mozilla.org'
-releaseConfig['ausServerUrl'] = 'https://aus4.mozilla.org'
-releaseConfig['releaseNotesUrl'] = None
-releaseConfig['testOlderPartials'] = False
-releaseConfig['promptWaitTime'] = None
-releaseConfig['useBetaChannel'] = 1
-releaseConfig['updateVerifyChunks'] = 6
-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',
- 'win64': 'browser/config/mozconfigs/win64/release',
-}
-releaseConfig['releaseChannel'] = 'esr'
-releaseConfig['updateChannels'] = {
- # ruleId needs to be updated with the ID from AUS
- "esr": {
- "versionRegex": r"^.*$",
- "ruleId": "esr45",
- "patcherConfig": "mozEsr45-branch-patcher2.cfg",
- "localTestChannel": "esr-localtest",
- "cdnTestChannel": "esr-cdntest",
- "verifyConfigs": {
- "linux": "mozilla-esr45-firefox-linux.cfg",
- "linux64": "mozilla-esr45-firefox-linux64.cfg",
- "macosx64": "mozilla-esr45-firefox-mac64.cfg",
- "win32": "mozilla-esr45-firefox-win32.cfg",
- "win64": "mozilla-esr45-firefox-win64.cfg",
- },
- "testChannels": {
- "esr-localtest": {
- "ruleId": "esr45-localtest",
- },
- "esr-cdntest": {
- "ruleId": "esr45-cdntest",
- },
- },
- },
-}
-
-
-# Partner repack configuration
-releaseConfig['doPartnerRepacks'] = False
-releaseConfig['partnersRepoPath'] = 'build/partner-repacks'
-
-# Tuxedo/Bouncer configuration
-releaseConfig['tuxedoServerUrl'] = 'https://bounceradmin.mozilla.com/api'
-releaseConfig['bouncer_submitter_config'] = 'releases/bouncer_firefox_esr.py'
-
-# Misc configuration
-releaseConfig['enableAutomaticPushToMirrors'] = False
-releaseConfig['use_mock'] = True
-releaseConfig['mock_platforms'] = ('linux','linux64')
-releaseConfig['bouncer_aliases'] = {
- 'Firefox-%(version)s': 'firefox-esr-latest',
-}
\ No newline at end of file
deleted file mode 100644
--- a/mozilla/release-firefox-mozilla-esr45.py.template
+++ /dev/null
@@ -1,160 +0,0 @@
-# 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['base_clobber_url'] = 'https://api.pub.build.mozilla.org/clobberer/forceclobber'
-
-# Release Notification
-releaseConfig['AllRecipients'] = ['<release-automation-notifications@mozilla.com>',]
-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'] = {
-{% for version, partial in partials.items() %}
- '{{ version }}': {
- 'appVersion': '{{ partial['appVersion'] }}',
- 'buildNumber': {{ partial['buildNumber'] }},
- 'baseTag': '{{ partial['baseTag'] }}',
- },
-{% endfor %}
-}
-
-releaseConfig['HACK_first_released_version'] = {'win64': "45.0"}
-
-# Next (nightly) version info
-releaseConfig['nextAppVersion'] = '{{ version }}pre'
-releaseConfig['nextMilestone'] = releaseConfig['nextAppVersion']
-# Repository configuration, for tagging
-releaseConfig['sourceRepositories'] = {
- 'mozilla': {
- 'name': 'mozilla-esr45',
- 'path': '{{ branch }}',
- 'revision': '{{ mozillaRevision }}',
- 'relbranch': {% if mozillaRelbranch %}'{{ mozillaRelbranch }}'{% else %}None{% endif %},
- 'bumpFiles': {
- 'browser/config/version.txt': {
- 'version': releaseConfig['appVersion'],
- 'nextVersion': releaseConfig['nextAppVersion']
- },
- 'browser/config/version_display.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-esr45'
-# Support repositories
-releaseConfig['otherReposToTag'] = {
- 'build/compare-locales': 'RELEASE_0_9_5',
- 'build/buildbot': 'production-0.8',
-}
-
-# Platform configuration
-releaseConfig['enUSPlatforms'] = ('linux', 'linux64', 'macosx64', 'win32', 'win64')
-releaseConfig['notifyPlatforms'] = releaseConfig['enUSPlatforms']
-releaseConfig['talosTestPlatforms'] = ()
-
-# Unittests
-releaseConfig['unittestPlatforms'] = ()
-releaseConfig['enableUnittests'] = False
-
-# SDK
-releaseConfig['packageSDK'] = True
-
-# 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['ftpServer'] = 'archive.mozilla.org'
-releaseConfig['stagingServer'] = 'upload.ffxbld.productdelivery.prod.mozaws.net'
-releaseConfig['S3Credentials'] = '/builds/release-s3.credentials'
-releaseConfig['S3Bucket'] = 'net-mozaws-prod-delivery-firefox'
-releaseConfig['bouncerServer'] = 'download.mozilla.org'
-releaseConfig['ausServerUrl'] = 'https://aus4.mozilla.org'
-releaseConfig['releaseNotesUrl'] = None
-releaseConfig['testOlderPartials'] = False
-releaseConfig['promptWaitTime'] = {{ promptWaitTime }}
-releaseConfig['useBetaChannel'] = 1
-releaseConfig['updateVerifyChunks'] = 6
-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',
- 'win64': 'browser/config/mozconfigs/win64/release',
-}
-releaseConfig['releaseChannel'] = 'esr'
-releaseConfig['updateChannels'] = {
- # ruleId needs to be updated with the ID from AUS
- "esr": {
- "versionRegex": r"^.*$",
- "ruleId": "esr45",
- "patcherConfig": "mozEsr45-branch-patcher2.cfg",
- "localTestChannel": "esr-localtest",
- "cdnTestChannel": "esr-cdntest",
- "verifyConfigs": {
- "linux": "mozilla-esr45-firefox-linux.cfg",
- "linux64": "mozilla-esr45-firefox-linux64.cfg",
- "macosx64": "mozilla-esr45-firefox-mac64.cfg",
- "win32": "mozilla-esr45-firefox-win32.cfg",
- "win64": "mozilla-esr45-firefox-win64.cfg",
- },
- "testChannels": {
- "esr-localtest": {
- "ruleId": "esr45-localtest",
- },
- "esr-cdntest": {
- "ruleId": "esr45-cdntest",
- },
- },
- },
-}
-
-
-# Partner repack configuration
-releaseConfig['doPartnerRepacks'] = False
-releaseConfig['partnersRepoPath'] = 'build/partner-repacks'
-
-# Tuxedo/Bouncer configuration
-releaseConfig['tuxedoServerUrl'] = 'https://bounceradmin.mozilla.com/api'
-releaseConfig['bouncer_submitter_config'] = 'releases/bouncer_firefox_esr.py'
-
-# Misc configuration
-releaseConfig['enableAutomaticPushToMirrors'] = False
-releaseConfig['use_mock'] = True
-releaseConfig['mock_platforms'] = ('linux','linux64')
-releaseConfig['bouncer_aliases'] = {
- 'Firefox-%(version)s': 'firefox-esr-latest',
-}
deleted file mode 100644
--- a/mozilla/release-firefox-mozilla-release.py
+++ /dev/null
@@ -1,214 +0,0 @@
-# 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['base_clobber_url'] = 'https://api.pub.build.mozilla.org/clobberer/forceclobber'
-
-# Release Notification
-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'] = '45.0.2'
-releaseConfig['appVersion'] = '45.0.2'
-releaseConfig['milestone'] = releaseConfig['appVersion']
-releaseConfig['buildNumber'] = 1
-releaseConfig['baseTag'] = 'FIREFOX_45_0_2'
-releaseConfig['partialUpdates'] = {
-
- '42.0': {
- 'appVersion': '42.0',
- 'buildNumber': 2,
- 'baseTag': 'FIREFOX_42_0',
- },
-
- '41.0.2': {
- 'appVersion': '41.0.2',
- 'buildNumber': 2,
- 'baseTag': 'FIREFOX_41_0_2',
- },
-
- '39.0': {
- 'appVersion': '39.0',
- 'buildNumber': 6,
- 'baseTag': 'FIREFOX_39_0',
- },
-
- '45.0.1': {
- 'appVersion': '45.0.1',
- 'buildNumber': 1,
- 'baseTag': 'FIREFOX_45_0_1',
- },
-
-}
-# What's New Page, should be revisited with each release.
-# releaseConfig['openURL'] = 'https://www.mozilla.org/%LOCALE%/firefox/45.0.2/whatsnew/?oldversion=%OLD_VERSION%'
-
-releaseConfig['HACK_first_released_version'] = {'win64': "42.0"}
-
-# 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': 'ac2c157c4bd7',
- 'relbranch': None,
- 'bumpFiles': {
- 'browser/config/version.txt': {
- 'version': releaseConfig['appVersion'],
- 'nextVersion': releaseConfig['nextAppVersion']
- },
- 'browser/config/version_display.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'
-# Support repositories
-releaseConfig['otherReposToTag'] = {
- 'build/compare-locales': 'RELEASE_AUTOMATION',
- 'build/buildbot': 'production-0.8',
-}
-
-# Platform configuration
-releaseConfig['enUSPlatforms'] = ('linux', 'linux64', 'win32', 'macosx64', "win64")
-releaseConfig['notifyPlatforms'] = releaseConfig['enUSPlatforms']
-releaseConfig['talosTestPlatforms'] = ()
-
-# Unittests
-releaseConfig['unittestPlatforms'] = ()
-releaseConfig['enableUnittests'] = False
-
-# SDK
-releaseConfig['packageSDK'] = True
-
-# 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['ftpServer'] = 'archive.mozilla.org'
-releaseConfig['stagingServer'] = 'upload.ffxbld.productdelivery.prod.mozaws.net'
-releaseConfig['S3Credentials'] = '/builds/release-s3.credentials'
-releaseConfig['S3Bucket'] = 'net-mozaws-prod-delivery-firefox'
-releaseConfig['bouncerServer'] = 'download.mozilla.org'
-releaseConfig['ausServerUrl'] = 'https://aus4.mozilla.org'
-releaseConfig['releaseNotesUrl'] = None
-releaseConfig['testOlderPartials'] = False
-releaseConfig['promptWaitTime'] = None
-releaseConfig['updateVerifyChunks'] = 6
-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',
- 'win64': 'browser/config/mozconfigs/win64/release',
-}
-releaseConfig["releaseChannel"] = "release"
-releaseConfig['updateChannels'] = {
- "release": {
- "versionRegex": r"^\d+\.\d+(\.\d+)?$",
- "ruleId": 145,
- "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",
- "win32": "mozRelease-firefox-win32.cfg",
- "win64": "mozRelease-firefox-win64.cfg",
- },
- "testChannels": {
- "release-localtest": {
- "ruleId": 56,
- },
- "release-cdntest": {
- "ruleId": 57,
- },
- },
- },
- "beta": {
- "enabled": False,
- # 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+)?)$",
- "ruleId": 32,
- "requiresMirrors": False,
- "patcherConfig": "mozBeta-branch-patcher2.cfg",
- "localTestChannel": "beta-localtest",
- "cdnTestChannel": "beta-cdntest",
- "verifyConfigs": {
- "linux": "beta-firefox-linux.cfg",
- "linux64": "beta-firefox-linux64.cfg",
- "macosx64": "beta-firefox-macosx64.cfg",
- "win32": "beta-firefox-win32.cfg",
- "win64": "beta-firefox-win64.cfg",
- },
- "marChannelIds": [
- "firefox-mozilla-beta",
- "firefox-mozilla-release",
- ],
- "testChannels": {
- "beta-cdntest": {
- "ruleId": 45,
- },
- "beta-localtest": {
- "ruleId": 25,
- },
- }
- }
-}
-
-# Partner repack configuration
-releaseConfig['doPartnerRepacks'] = True
-releaseConfig['partnerRepackPlatforms'] = releaseConfig['l10nPlatforms']
-releaseConfig['partnerRepackConfig'] = {
- 'use_mozharness': True,
- 'script': 'scripts/desktop_partner_repacks.py',
- 'config_file': 'partner_repacks/release_mozilla-release_desktop.py',
- 's3cfg': '/builds/partners-s3cfg',
-}
-
-# Tuxedo/Bouncer configuration
-releaseConfig['tuxedoServerUrl'] = 'https://bounceradmin.mozilla.com/api'
-releaseConfig['bouncer_submitter_config'] = 'releases/bouncer_firefox_release.py'
-
-# Misc configuration
-releaseConfig['use_mock'] = True
-releaseConfig['mock_platforms'] = ('linux','linux64')
-
-releaseConfig['bouncer_aliases'] = {
- 'Firefox-%(version)s': 'firefox-latest',
- 'Firefox-%(version)s-stub': 'firefox-stub',
-}
\ No newline at end of file
deleted file mode 100644
--- a/mozilla/release-firefox-mozilla-release.py.template
+++ /dev/null
@@ -1,196 +0,0 @@
-# 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['base_clobber_url'] = 'https://api.pub.build.mozilla.org/clobberer/forceclobber'
-
-# Release Notification
-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'] = '{{ 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 %}
-}
-# What's New Page, should be revisited with each release.
-# releaseConfig['openURL'] = 'https://www.mozilla.org/%LOCALE%/firefox/{{ appVersion }}/whatsnew/?oldversion=%OLD_VERSION%'
-
-releaseConfig['HACK_first_released_version'] = {'win64': "42.0"}
-
-# Next (nightly) version info
-releaseConfig['nextAppVersion'] = releaseConfig['appVersion']
-releaseConfig['nextMilestone'] = releaseConfig['milestone']
-# Repository configuration, for tagging
-releaseConfig['sourceRepositories'] = {
- 'mozilla': {
- 'name': 'mozilla-release',
- 'path': '{{ branch }}',
- 'revision': '{{ mozillaRevision }}',
- 'relbranch': {% if mozillaRelbranch %}'{{ mozillaRelbranch }}'{% else %}None{% endif %},
- 'bumpFiles': {
- 'browser/config/version.txt': {
- 'version': releaseConfig['appVersion'],
- 'nextVersion': releaseConfig['nextAppVersion']
- },
- 'browser/config/version_display.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'
-# Support repositories
-releaseConfig['otherReposToTag'] = {
- 'build/compare-locales': 'RELEASE_AUTOMATION',
- 'build/buildbot': 'production-0.8',
-}
-
-# Platform configuration
-releaseConfig['enUSPlatforms'] = ('linux', 'linux64', 'win32', 'macosx64', "win64")
-releaseConfig['notifyPlatforms'] = releaseConfig['enUSPlatforms']
-releaseConfig['talosTestPlatforms'] = ()
-
-# Unittests
-releaseConfig['unittestPlatforms'] = ()
-releaseConfig['enableUnittests'] = False
-
-# SDK
-releaseConfig['packageSDK'] = True
-
-# 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['ftpServer'] = 'archive.mozilla.org'
-releaseConfig['stagingServer'] = 'upload.ffxbld.productdelivery.prod.mozaws.net'
-releaseConfig['S3Credentials'] = '/builds/release-s3.credentials'
-releaseConfig['S3Bucket'] = 'net-mozaws-prod-delivery-firefox'
-releaseConfig['bouncerServer'] = 'download.mozilla.org'
-releaseConfig['ausServerUrl'] = 'https://aus4.mozilla.org'
-releaseConfig['releaseNotesUrl'] = None
-releaseConfig['testOlderPartials'] = False
-releaseConfig['promptWaitTime'] = {{ promptWaitTime }}
-releaseConfig['updateVerifyChunks'] = 6
-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',
- 'win64': 'browser/config/mozconfigs/win64/release',
-}
-releaseConfig["releaseChannel"] = "release"
-releaseConfig['updateChannels'] = {
- "release": {
- "versionRegex": r"^\d+\.\d+(\.\d+)?$",
- "ruleId": 145,
- "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",
- "win32": "mozRelease-firefox-win32.cfg",
- "win64": "mozRelease-firefox-win64.cfg",
- },
- "testChannels": {
- "release-localtest": {
- "ruleId": 56,
- },
- "release-cdntest": {
- "ruleId": 57,
- },
- },
- },
- "beta": {
- "enabled": {{ betaChannelEnabled }},
- # 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+)?)$",
- "ruleId": 32,
- "requiresMirrors": False,
- "patcherConfig": "mozBeta-branch-patcher2.cfg",
- "localTestChannel": "beta-localtest",
- "cdnTestChannel": "beta-cdntest",
- "verifyConfigs": {
- "linux": "beta-firefox-linux.cfg",
- "linux64": "beta-firefox-linux64.cfg",
- "macosx64": "beta-firefox-macosx64.cfg",
- "win32": "beta-firefox-win32.cfg",
- "win64": "beta-firefox-win64.cfg",
- },
- "marChannelIds": [
- "firefox-mozilla-beta",
- "firefox-mozilla-release",
- ],
- "testChannels": {
- "beta-cdntest": {
- "ruleId": 45,
- },
- "beta-localtest": {
- "ruleId": 25,
- },
- }
- }
-}
-
-# Partner repack configuration
-releaseConfig['doPartnerRepacks'] = True
-releaseConfig['partnerRepackPlatforms'] = releaseConfig['l10nPlatforms']
-releaseConfig['partnerRepackConfig'] = {
- 'use_mozharness': True,
- 'script': 'scripts/desktop_partner_repacks.py',
- 'config_file': 'partner_repacks/release_mozilla-release_desktop.py',
- 's3cfg': '/builds/partners-s3cfg',
-}
-
-# Tuxedo/Bouncer configuration
-releaseConfig['tuxedoServerUrl'] = 'https://bounceradmin.mozilla.com/api'
-releaseConfig['bouncer_submitter_config'] = 'releases/bouncer_firefox_release.py'
-
-# Misc configuration
-releaseConfig['use_mock'] = True
-releaseConfig['mock_platforms'] = ('linux','linux64')
-
-releaseConfig['bouncer_aliases'] = {
- 'Firefox-%(version)s': 'firefox-latest',
- 'Firefox-%(version)s-stub': 'firefox-stub',
-}
--- a/mozilla/scheduler_master.cfg
+++ b/mozilla/scheduler_master.cfg
@@ -96,18 +96,16 @@ if ENABLE_RELEASES:
reload(buildbotcustom.process.release)
from buildbotcustom.process.release import generateReleaseBranchObjects
# TODO remove this block when we have completely switched to release promotion
# Bug 1215865 - remove generateReleaseBranchObjects after fully porting to release promotion
for product, sourceRepoKey, productBranches, releaseBranch in \
[('thunderbird', 'comm', THUNDERBIRD_BRANCHES, b)
for b in ACTIVE_THUNDERBIRD_RELEASE_BRANCHES] + \
- [('firefox', 'mozilla', BRANCHES, b)
- for b in ACTIVE_RELEASE_BRANCHES] + \
[('fennec', 'mobile', BRANCHES, b)
for b in ACTIVE_MOBILE_RELEASE_BRANCHES]:
releaseBranchConfig = {}
releaseConfigFile = "release-%s-%s.py" % (product, releaseBranch)
execfile(releaseConfigFile, releaseBranchConfig, releaseBranchConfig)
branchConfig = productBranches[releaseBranchConfig['releaseConfig']['sourceRepositories'][sourceRepoKey]['name']]
releaseObjects = generateReleaseBranchObjects(
releaseBranchConfig['releaseConfig'], branchConfig,
deleted file mode 100644
--- a/mozilla/staging_release-firefox-mozilla-beta.py
+++ /dev/null
@@ -1,179 +0,0 @@
-# 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['base_clobber_url'] = 'https://api-pub-build.allizom.org/clobberer/forceclobber'
-
-# 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'] = '46.0b1'
-releaseConfig['appVersion'] = '46.0'
-releaseConfig['milestone'] = releaseConfig['appVersion']
-releaseConfig['buildNumber'] = 1
-releaseConfig['baseTag'] = 'FIREFOX_46_0b1'
-releaseConfig['partialUpdates'] = {
-
- '45.0b9': {
- 'appVersion': '45.0',
- 'buildNumber': 2,
- 'baseTag': 'FIREFOX_45_0b9',
- },
-
- '45.0b10': {
- 'appVersion': '45.0',
- 'buildNumber': 1,
- 'baseTag': 'FIREFOX_45_0b10',
- },
-
-}
-releaseConfig['ui_update_tests'] = False
-
-# win64 support
-releaseConfig['HACK_first_released_version'] = {'win64': '37.0b2'}
-
-# Next (nightly) version info
-releaseConfig['nextAppVersion'] = releaseConfig['appVersion']
-releaseConfig['nextVersion'] = releaseConfig['version']
-releaseConfig['nextMilestone'] = releaseConfig['milestone']
-# Repository configuration, for tagging
-releaseConfig['sourceRepositories'] = {
- 'mozilla': {
- 'name': 'mozilla-beta',
- 'path': 'users/stage-ffxbld/mozilla-beta',
- 'revision': 'default',
- 'relbranch': None,
- 'bumpFiles': {
- 'browser/config/version.txt': {
- 'version': releaseConfig['appVersion'],
- 'nextVersion': releaseConfig['nextAppVersion']
- },
- 'browser/config/version_display.txt': {
- 'version': releaseConfig['version'],
- 'nextVersion': releaseConfig['nextVersion']
- },
- 'config/milestone.txt': {
- 'version': releaseConfig['milestone'],
- 'nextVersion': releaseConfig['nextMilestone']
- },
- }
- }
-}
-# L10n repositories
-releaseConfig['l10nRelbranch'] = None
-releaseConfig['l10nRepoPath'] = 'users/stage-ffxbld'
-releaseConfig['l10nRevisionFile'] = 'l10n-changesets_mozilla-beta'
-# Support repositories
-releaseConfig['otherReposToTag'] = {
- 'users/stage-ffxbld/compare-locales': 'RELEASE_AUTOMATION',
- 'users/stage-ffxbld/buildbot': 'production-0.8',
-}
-
-# Platform configuration
-releaseConfig['enUSPlatforms'] = ('linux', 'linux64', 'win32', 'macosx64', 'win64')
-releaseConfig['notifyPlatforms'] = releaseConfig['enUSPlatforms']
-releaseConfig['talosTestPlatforms'] = ()
-
-# Unittests
-releaseConfig['unittestPlatforms'] = ()
-releaseConfig['enableUnittests'] = False
-
-# SDK
-releaseConfig['packageSDK'] = 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['ftpServer'] = 'ftp.stage.mozaws.net'
-releaseConfig['stagingServer'] = 'upload.ffxbld.productdelivery.stage.mozaws.net'
-releaseConfig['previousReleasesStagingServer'] = 'archive.mozilla.org'
-releaseConfig['S3Credentials'] = '/builds/release-s3.credentials'
-releaseConfig['S3Bucket'] = 'net-mozaws-stage-delivery-firefox'
-releaseConfig['bouncerServer'] = 'download.mozilla.org'
-releaseConfig['ausServerUrl'] = 'https://aus4-dev.allizom.org'
-releaseConfig['releaseNotesUrl'] = None
-releaseConfig['testOlderPartials'] = False
-releaseConfig['promptWaitTime'] = None
-releaseConfig['updateVerifyChunks'] = 6
-releaseConfig['mozconfigs'] = {
- 'linux': 'browser/config/mozconfigs/linux32/beta',
- 'linux64': 'browser/config/mozconfigs/linux64/beta',
- 'macosx64': 'browser/config/mozconfigs/macosx-universal/beta',
- 'win32': 'browser/config/mozconfigs/win32/beta',
- 'win64': 'browser/config/mozconfigs/win64/beta',
-}
-releaseConfig['source_mozconfig'] = 'browser/config/mozconfigs/linux64/source'
-releaseConfig['releaseChannel'] = 'beta'
-releaseConfig['updateChannels'] = {
- "beta": {
- "versionRegex": r"^.*$",
- "ruleId": 26,
- "patcherConfig": "mozBeta-branch-patcher2.cfg",
- "localTestChannel": "beta-localtest",
- "cdnTestChannel": "beta-cdntest",
- "verifyConfigs": {
- "linux": "mozBeta-firefox-linux.cfg",
- "linux64": "mozBeta-firefox-linux64.cfg",
- "macosx64": "mozBeta-firefox-mac64.cfg",
- "win32": "mozBeta-firefox-win32.cfg",
- "win64": "mozBeta-firefox-win64.cfg",
- },
- "testChannels": {
- "beta-cdntest": {
- "ruleId": 41,
- },
- "beta-localtest": {
- "ruleId": 40,
- },
- }
- }
-}
-
-# Partner repack configuration
-releaseConfig['doPartnerRepacks'] = True
-releaseConfig['partnerRepackPlatforms'] = releaseConfig['l10nPlatforms']
-releaseConfig['partnerRepackConfig'] = {
- 'use_mozharness': True,
- 'script': 'scripts/desktop_partner_repacks.py',
- 'config_file': 'partner_repacks/release_mozilla-release_desktop.py',
- 's3cfg': '/builds/partners-s3cfg',
-}
-
-# Tuxedo/Bouncer configuration
-releaseConfig['tuxedoServerUrl'] = 'https://admin-bouncer.stage.mozaws.net/api'
-releaseConfig['bouncer_submitter_config'] = 'releases/bouncer_firefox_beta.py'
-
-# Misc configuration
-releaseConfig['build_tools_repo_path'] = "users/stage-ffxbld/tools"
-releaseConfig['enableAutomaticPushToMirrors'] = True
-releaseConfig['use_mock'] = True
-releaseConfig['mock_platforms'] = ('linux','linux64')
-
-releaseConfig['bouncer_aliases'] = {
- 'Firefox-%(version)s': 'firefox-beta-latest',
- 'Firefox-%(version)s-stub': 'firefox-beta-stub',
-}
deleted file mode 100644
--- a/mozilla/staging_release-firefox-mozilla-beta.py.template
+++ /dev/null
@@ -1,173 +0,0 @@
-# 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['base_clobber_url'] = 'https://api-pub-build.allizom.org/clobberer/forceclobber'
-
-# 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 %}
-}
-releaseConfig['ui_update_tests'] = False
-
-# win64 support
-releaseConfig['HACK_first_released_version'] = {'win64': '37.0b2'}
-
-# Next (nightly) version info
-releaseConfig['nextAppVersion'] = releaseConfig['appVersion']
-releaseConfig['nextVersion'] = releaseConfig['version']
-releaseConfig['nextMilestone'] = releaseConfig['milestone']
-# Repository configuration, for tagging
-releaseConfig['sourceRepositories'] = {
- 'mozilla': {
- 'name': 'mozilla-beta',
- 'path': '{{ branch }}',
- 'revision': '{{ mozillaRevision }}',
- 'relbranch': {% if mozillaRelbranch %}'{{ mozillaRelbranch }}'{% else %}None{% endif %},
- 'bumpFiles': {
- 'browser/config/version.txt': {
- 'version': releaseConfig['appVersion'],
- 'nextVersion': releaseConfig['nextAppVersion']
- },
- 'browser/config/version_display.txt': {
- 'version': releaseConfig['version'],
- 'nextVersion': releaseConfig['nextVersion']
- },
- 'config/milestone.txt': {
- 'version': releaseConfig['milestone'],
- 'nextVersion': releaseConfig['nextMilestone']
- },
- }
- }
-}
-# L10n repositories
-releaseConfig['l10nRelbranch'] = None
-releaseConfig['l10nRepoPath'] = 'users/stage-ffxbld'
-releaseConfig['l10nRevisionFile'] = 'l10n-changesets_mozilla-beta'
-# Support repositories
-releaseConfig['otherReposToTag'] = {
- 'users/stage-ffxbld/compare-locales': 'RELEASE_AUTOMATION',
- 'users/stage-ffxbld/buildbot': 'production-0.8',
-}
-
-# Platform configuration
-releaseConfig['enUSPlatforms'] = ('linux', 'linux64', 'win32', 'macosx64', 'win64')
-releaseConfig['notifyPlatforms'] = releaseConfig['enUSPlatforms']
-releaseConfig['talosTestPlatforms'] = ()
-
-# Unittests
-releaseConfig['unittestPlatforms'] = ()
-releaseConfig['enableUnittests'] = False
-
-# SDK
-releaseConfig['packageSDK'] = True
-
-# L10n configuration
-releaseConfig['l10nPlatforms'] = releaseConfig['enUSPlatforms']
-releaseConfig['shippedLocalesPath'] = 'browser/locales/shipped-locales'
-releaseConfig['l10nChunks'] = 1
-releaseConfig['mergeLocales'] = True
-releaseConfig['l10nUsePymake'] = True
-
-# Mercurial account
-releaseConfig['hgUsername'] = 'stage-ffxbld'
-releaseConfig['hgSshKey'] = '/home/mock_mozilla/.ssh/ffxbld_rsa'
-
-# Update-specific configuration
-releaseConfig['ftpServer'] = 'ftp.stage.mozaws.net'
-releaseConfig['stagingServer'] = 'upload.ffxbld.productdelivery.stage.mozaws.net'
-releaseConfig['previousReleasesStagingServer'] = 'archive.mozilla.org'
-releaseConfig['S3Credentials'] = '/builds/release-s3.credentials'
-releaseConfig['S3Bucket'] = 'net-mozaws-stage-delivery-firefox'
-releaseConfig['bouncerServer'] = 'download.mozilla.org'
-releaseConfig['ausServerUrl'] = 'https://aus4-dev.allizom.org'
-releaseConfig['releaseNotesUrl'] = None
-releaseConfig['testOlderPartials'] = False
-releaseConfig['promptWaitTime'] = {{ promptWaitTime }}
-releaseConfig['updateVerifyChunks'] = 6
-releaseConfig['mozconfigs'] = {
- 'linux': 'browser/config/mozconfigs/linux32/beta',
- 'linux64': 'browser/config/mozconfigs/linux64/beta',
- 'macosx64': 'browser/config/mozconfigs/macosx-universal/beta',
- 'win32': 'browser/config/mozconfigs/win32/beta',
- 'win64': 'browser/config/mozconfigs/win64/beta',
-}
-releaseConfig['source_mozconfig'] = 'browser/config/mozconfigs/linux64/source'
-releaseConfig['releaseChannel'] = 'beta'
-releaseConfig['updateChannels'] = {
- "beta": {
- "versionRegex": r"^.*$",
- "ruleId": 26,
- "patcherConfig": "mozBeta-branch-patcher2.cfg",
- "localTestChannel": "beta-localtest",
- "cdnTestChannel": "beta-cdntest",
- "verifyConfigs": {
- "linux": "beta-firefox-linux.cfg",
- "linux64": "beta-firefox-linux64.cfg",
- "macosx64": "beta-firefox-macosx64.cfg",
- "win32": "beta-firefox-win32.cfg",
- "win64": "beta-firefox-win64.cfg",
- },
- "testChannels": {
- "beta-cdntest": {
- "ruleId": 41,
- },
- "beta-localtest": {
- "ruleId": 40,
- },
- }
- }
-}
-
-# Partner repack configuration
-releaseConfig['doPartnerRepacks'] = True
-releaseConfig['partnerRepackPlatforms'] = releaseConfig['l10nPlatforms']
-releaseConfig['partnerRepackConfig'] = {
- 'use_mozharness': True,
- 'script': 'scripts/desktop_partner_repacks.py',
- 'config_file': 'partner_repacks/release_mozilla-release_desktop.py',
- 's3cfg': '/builds/partners-s3cfg',
-}
-
-# Tuxedo/Bouncer configuration
-releaseConfig['tuxedoServerUrl'] = 'https://admin-bouncer.stage.mozaws.net/api'
-releaseConfig['bouncer_submitter_config'] = 'releases/bouncer_firefox_beta.py'
-
-# Misc configuration
-releaseConfig['build_tools_repo_path'] = "users/stage-ffxbld/tools"
-releaseConfig['enableAutomaticPushToMirrors'] = True
-releaseConfig['use_mock'] = True
-releaseConfig['mock_platforms'] = ('linux','linux64')
-
-releaseConfig['bouncer_aliases'] = {
- 'Firefox-%(version)s': 'firefox-beta-latest',
- 'Firefox-%(version)s-stub': 'firefox-beta-stub',
-}
deleted file mode 100644
--- a/mozilla/staging_release-firefox-mozilla-esr45.py
+++ /dev/null
@@ -1,131 +0,0 @@
-# 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['base_clobber_url'] = 'https://api-pub-build.allizom.org/clobberer/forceclobber'
-
-# 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'] = '38.0esr'
-releaseConfig['appVersion'] = '38.0'
-releaseConfig['milestone'] = releaseConfig['appVersion']
-releaseConfig['buildNumber'] = 1
-releaseConfig['baseTag'] = 'FIREFOX_38_0esr'
-releaseConfig['partialUpdates'] = {}
-# Next (nightly) version info
-releaseConfig['nextAppVersion'] = '{{ version }}pre'
-releaseConfig['nextMilestone'] = releaseConfig['nextAppVersion']
-# Repository configuration, for tagging
-releaseConfig['sourceRepositories'] = {
- 'mozilla': {
- 'name': 'mozilla-esr45',
- 'path': 'users/stage-ffxbld/mozilla-esr45',
- '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['l10nRepoPath'] = 'users/stage-ffxbld'
-releaseConfig['l10nRevisionFile'] = 'l10n-changesets_mozilla-esr45'
-# Support repositories
-releaseConfig['otherReposToTag'] = {
- 'users/stage-ffxbld/compare-locales': 'RELEASE_0_9_5',
- 'users/stage-ffxbld/buildbot': 'production-0.8',
- 'users/stage-ffxbld/partner-repacks': 'default',
-}
-
-# Platform configuration
-releaseConfig['enUSPlatforms'] = ('linux', 'linux64', 'win32', 'macosx64')
-releaseConfig['notifyPlatforms'] = releaseConfig['enUSPlatforms']
-releaseConfig['talosTestPlatforms'] = 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['ftpServer'] = 'ftp.stage.mozaws.net'
-releaseConfig['stagingServer'] = 'upload.ffxbld.productdelivery.stage.mozaws.net'
-releaseConfig['previousReleasesStagingServer'] = 'archive.mozilla.org'
-releaseConfig['S3Credentials'] = '/builds/release-s3.credentials'
-releaseConfig['S3Bucket'] = 'net-mozaws-stage-delivery-firefox'
-releaseConfig['bouncerServer'] = 'download.mozilla.org'
-releaseConfig['ausServerUrl'] = 'https://aus4-dev.allizom.org'
-releaseConfig['releaseNotesUrl'] = None
-releaseConfig['testOlderPartials'] = False
-releaseConfig['releaseChannel'] = 'esr'
-releaseConfig['updateChannels'] = {
- # ruleId needs to be updated with the ID from AUS
- "esr": {
- "versionRegex": r"^.*$",
- "ruleId": "esr45-dev",
- "patcherConfig": "mozEsr45-branch-patcher2.cfg",
- "localTestChannel": "esr-localtest",
- "cdnTestChannel": "esr-cdntest",
- "verifyConfigs": {
- "linux": "mozEsr45-firefox-linux.cfg",
- "linux64": "mozEsr45-firefox-linux64.cfg",
- "macosx64": "mozEsr45-firefox-mac64.cfg",
- "win32": "mozEsr45-firefox-win32.cfg",
- },
- "testChannels": {
- "esr-cdntest": {
- "ruleId": "esr45-cdntest-dev",
- },
- "esr-localtest": {
- "ruleId": "esr45-localtest-dev",
- },
- }
- }
-}
-
-# Partner repack configuration
-releaseConfig['doPartnerRepacks'] = False
-releaseConfig['partnersRepoPath'] = 'users/stage-ffxbld/partner-repacks'
-
-# Tuxedo/Bouncer configuration
-releaseConfig['tuxedoServerUrl'] = 'https://admin-bouncer.stage.mozaws.net/api'
-releaseConfig['bouncer_submitter_config'] = 'releases/bouncer_firefox_esr.py'
-
-# Misc configuration
-releaseConfig['build_tools_repo_path'] = "users/stage-ffxbld/tools"
-releaseConfig['use_mock'] = True
-releaseConfig['mock_platforms'] = ('linux','linux64')
deleted file mode 100644
--- a/mozilla/staging_release-firefox-mozilla-esr45.py.template
+++ /dev/null
@@ -1,148 +0,0 @@
-# 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['base_clobber_url'] = 'https://api-pub-build.allizom.org/clobberer/forceclobber'
-
-# 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'] = '{{ version }}pre'
-releaseConfig['nextMilestone'] = releaseConfig['nextAppVersion']
-# Repository configuration, for tagging
-releaseConfig['sourceRepositories'] = {
- 'mozilla': {
- 'name': 'mozilla-esr45',
- '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'] = 'users/stage-ffxbld'
-releaseConfig['l10nRevisionFile'] = 'l10n-changesets_mozilla-esr45'
-# Support repositories
-releaseConfig['otherReposToTag'] = {
- 'users/stage-ffxbld/compare-locales': 'RELEASE_0_9_5',
- 'users/stage-ffxbld/buildbot': 'production-0.8',
-}
-
-# Platform configuration
-releaseConfig['enUSPlatforms'] = ('linux', 'linux64', 'win32', 'macosx64')
-releaseConfig['notifyPlatforms'] = releaseConfig['enUSPlatforms']
-releaseConfig['talosTestPlatforms'] = ()
-
-# Unittests
-releaseConfig['unittestPlatforms'] = ()
-releaseConfig['enableUnittests'] = False
-
-# SDK
-releaseConfig['packageSDK'] = 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['ftpServer'] = 'ftp.stage.mozaws.net'
-releaseConfig['stagingServer'] = 'upload.ffxbld.productdelivery.stage.mozaws.net'
-releaseConfig['previousReleasesStagingServer'] = 'archive.mozilla.org'
-releaseConfig['S3Credentials'] = '/builds/release-s3.credentials'
-releaseConfig['S3Bucket'] = 'net-mozaws-stage-delivery-firefox'
-releaseConfig['bouncerServer'] = 'download.mozilla.org'
-releaseConfig['ausServerUrl'] = 'https://aus4-dev.allizom.org'
-releaseConfig['releaseNotesUrl'] = None
-releaseConfig['testOlderPartials'] = False
-releaseConfig['promptWaitTime'] = {{ promptWaitTime }}
-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['releaseChannel'] = 'esr'
-releaseConfig['updateChannels'] = {
- # ruleId needs to be updated with the ID from AUS
- "esr": {
- "versionRegex": r"^.*$",
- "ruleId": "esr45-dev",
- "patcherConfig": "mozEsr45-branch-patcher2.cfg",
- "localTestChannel": "esr-localtest",
- "cdnTestChannel": "esr-cdntest",
- "verifyConfigs": {
- "linux": "mozEsr45-firefox-linux.cfg",
- "linux64": "mozEsr45-firefox-linux64.cfg",
- "macosx64": "mozEsr45-firefox-mac64.cfg",
- "win32": "mozEsr45-firefox-win32.cfg",
- },
- "testChannels": {
- "esr-localtest": {
- "ruleId": "esr45-localtest-dev",
- },
- "esr-cdntest": {
- "ruleId": "esr45-cdntest-dev",
- },
- }
- }
-}
-
-# Partner repack configuration
-releaseConfig['doPartnerRepacks'] = False
-releaseConfig['partnersRepoPath'] = 'users/stage-ffxbld/partner-repacks'
-
-# Tuxedo/Bouncer configuration
-releaseConfig['tuxedoServerUrl'] = 'https://admin-bouncer.stage.mozaws.net/api'
-releaseConfig['bouncer_submitter_config'] = 'releases/bouncer_firefox_esr.py'
-
-# Misc configuration
-releaseConfig['build_tools_repo_path'] = "users/stage-ffxbld/tools"
-releaseConfig['use_mock'] = True
-releaseConfig['mock_platforms'] = ('linux','linux64')
deleted file mode 100644
--- a/mozilla/staging_release-firefox-mozilla-release.py
+++ /dev/null
@@ -1,206 +0,0 @@
-# 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['base_clobber_url'] = 'https://api-pub-build.allizom.org/clobberer/forceclobber'
-
-# 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'] = '41.0'
-releaseConfig['appVersion'] = '41.0'
-releaseConfig['milestone'] = releaseConfig['appVersion']
-releaseConfig['buildNumber'] = 2
-releaseConfig['baseTag'] = 'FIREFOX_41_0'
-releaseConfig['partialUpdates'] = {
-
- '40.0.2': {
- 'appVersion': '40.0.2',
- 'buildNumber': 1,
- 'baseTag': 'FIREFOX_40_0_2',
- },
-
- '41.0b2': {
- 'appVersion': '41.0',
- 'buildNumber': 1,
- 'baseTag': 'FIREFOX_41_0b2',
- },
-
-}
-# What's New Page, should be revisited with each release.
-# releaseConfig['openURL'] = 'https://www.mozilla.org/%LOCALE%/firefox/41.0/whatsnew/?oldversion=%OLD_VERSION%'
-
-# win64 support
-#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': 'users/stage-ffxbld/mozilla-release',
- 'revision': '74f5ca4d4b6e',
- 'relbranch': None,
- 'bumpFiles': {
- 'browser/config/version.txt': {
- 'version': releaseConfig['appVersion'],
- 'nextVersion': releaseConfig['nextAppVersion']
- },
- 'browser/config/version_display.txt': {
- 'version': releaseConfig['appVersion'],
- 'nextVersion': releaseConfig['nextAppVersion']
- },
- 'config/milestone.txt': {
- 'version': releaseConfig['milestone'],
- 'nextVersion': releaseConfig['nextMilestone']
- },
- }
- }
-}
-# L10n repositories
-releaseConfig['l10nRelbranch'] = None
-releaseConfig['l10nRepoPath'] = 'users/stage-ffxbld'
-releaseConfig['l10nRevisionFile'] = 'l10n-changesets_mozilla-release'
-# Support repositories
-releaseConfig['otherReposToTag'] = {
- 'users/stage-ffxbld/compare-locales': 'RELEASE_AUTOMATION',
- 'users/stage-ffxbld/buildbot': 'production-0.8',
-}
-
-# Platform configuration
-# TODO: add win64 when we're ready to ship it
-releaseConfig['enUSPlatforms'] = ('linux', 'linux64', 'macosx64', 'win32', 'win64')
-releaseConfig['notifyPlatforms'] = releaseConfig['enUSPlatforms']
-releaseConfig['talosTestPlatforms'] = ()
-
-# Unittests
-releaseConfig['unittestPlatforms'] = ()
-releaseConfig['enableUnittests'] = False
-
-# L10n configuration
-releaseConfig['l10nPlatforms'] = releaseConfig['enUSPlatforms']
-releaseConfig['shippedLocalesPath'] = 'browser/locales/shipped-locales'
-releaseConfig['mergeLocales'] = True
-releaseConfig['l10nUsePymake'] = True
-releaseConfig['l10nChunks'] = 1
-
-# Mercurial account
-releaseConfig['hgUsername'] = 'stage-ffxbld'
-releaseConfig['hgSshKey'] = '/home/mock_mozilla/.ssh/ffxbld_rsa'
-
-# Update-specific configuration
-releaseConfig['ftpServer'] = 'ftp.stage.mozaws.net'
-releaseConfig['stagingServer'] = 'upload.ffxbld.productdelivery.stage.mozaws.net'
-releaseConfig['previousReleasesStagingServer'] = 'archive.mozilla.org'
-releaseConfig['S3Credentials'] = '/builds/release-s3.credentials'
-releaseConfig['S3Bucket'] = 'net-mozaws-stage-delivery-firefox'
-releaseConfig['bouncerServer'] = 'download.mozilla.org'
-releaseConfig['ausServerUrl'] = 'https://aus4-dev.allizom.org'
-releaseConfig['releaseNotesUrl'] = None
-releaseConfig['testOlderPartials'] = False
-releaseConfig['promptWaitTime'] = None
-releaseConfig['updateVerifyChunks'] = 2
-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',
- #'win64': 'browser/config/mozconfigs/win64/release',
-}
-releaseConfig["releaseChannel"] = "release"
-releaseConfig['updateChannels'] = {
- "release": {
- "versionRegex": r"^\d+\.\d+(\.\d+)?$",
- "ruleId": 31,
- "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",
- "win32": "mozRelease-firefox-win32.cfg",
- #"win64": "mozRelease-firefox-win64.cfg",
- },
- "testChannels": {
- "release-localtest": {
- "ruleId": 19,
- },
- "release-cdntest": {
- "ruleId": 20,
- },
- },
- },
- "beta": {
- "enabled": True,
- # 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+)?)$",
- "ruleId": 26,
- "requiresMirrors": False,
- "patcherConfig": "mozBeta-branch-patcher2.cfg",
- "localTestChannel": "beta-localtest",
- "cdnTestChannel": "beta-cdntest",
- "verifyConfigs": {
- "linux": "mozBeta-firefox-linux.cfg",
- "linux64": "mozBeta-firefox-linux64.cfg",
- "macosx64": "mozBeta-firefox-mac64.cfg",
- "win32": "mozBeta-firefox-win32.cfg",
- #"win64": "mozBeta-firefox-win32.cfg",
- },
- "marChannelIds": [
- "firefox-mozilla-beta",
- "firefox-mozilla-release",
- ],
- "testChannels": {
- "beta-cdntest": {
- "ruleId": 41,
- },
- "beta-localtest": {
- "ruleId": 40,
- },
- }
- }
-}
-
-# Partner repack configuration
-releaseConfig['doPartnerRepacks'] = True
-releaseConfig['partnerRepackPlatforms'] = releaseConfig['l10nPlatforms']
-releaseConfig['partnerRepackConfig'] = {
- 'use_mozharness': True,
- 'script': 'scripts/desktop_partner_repacks.py',
- 'config_file': 'partner_repacks/staging_release_mozilla-release_desktop.py',
- 's3cfg': '/builds/partners-s3cfg',
-}
-
-# Tuxedo/Bouncer configuration
-releaseConfig['tuxedoServerUrl'] = 'https://admin-bouncer.stage.mozaws.net/api'
-releaseConfig['bouncer_submitter_config'] = 'releases/bouncer_firefox_release.py'
-
-# Misc configuration
-releaseConfig['build_tools_repo_path'] = "users/stage-ffxbld/tools"
-releaseConfig['use_mock'] = True
-releaseConfig['mock_platforms'] = ('linux','linux64')
-
-releaseConfig['bouncer_aliases'] = {
- 'Firefox-%(version)s': 'firefox-latest',
- 'Firefox-%(version)s-stub': 'firefox-stub',
-}
deleted file mode 100644
--- a/mozilla/staging_release-firefox-mozilla-release.py.template
+++ /dev/null
@@ -1,203 +0,0 @@
-# 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['base_clobber_url'] = 'https://api-pub-build.allizom.org/clobberer/forceclobber'
-
-# 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 %}
-}
-# What's New Page, should be revisited with each release.
-# releaseConfig['openURL'] = 'https://www.mozilla.org/%LOCALE%/firefox/{{ appVersion }}/whatsnew/?oldversion=%OLD_VERSION%'
-
-# win64 support
-#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': '{{ branch }}',
- 'revision': '{{ mozillaRevision }}',
- 'relbranch': {% if mozillaRelbranch %}'{{ mozillaRelbranch }}'{% else %}None{% endif %},
- 'bumpFiles': {
- 'browser/config/version.txt': {
- 'version': releaseConfig['appVersion'],
- 'nextVersion': releaseConfig['nextAppVersion']
- },
- 'browser/config/version_display.txt': {
- 'version': releaseConfig['appVersion'],
- 'nextVersion': releaseConfig['nextAppVersion']
- },
- 'config/milestone.txt': {
- 'version': releaseConfig['milestone'],
- 'nextVersion': releaseConfig['nextMilestone']
- },
- }
- }
-}
-# L10n repositories
-releaseConfig['l10nRelbranch'] = None
-releaseConfig['l10nRepoPath'] = 'users/stage-ffxbld'
-releaseConfig['l10nRevisionFile'] = 'l10n-changesets_mozilla-release'
-# Support repositories
-releaseConfig['otherReposToTag'] = {
- 'users/stage-ffxbld/compare-locales': 'RELEASE_AUTOMATION',
- 'users/stage-ffxbld/buildbot': 'production-0.8',
-}
-
-# Platform configuration
-# TODO: add win64 when we're ready to ship it
-releaseConfig['enUSPlatforms'] = ('linux', 'linux64', 'win32', 'macosx64')
-releaseConfig['notifyPlatforms'] = releaseConfig['enUSPlatforms']
-releaseConfig['talosTestPlatforms'] = ()
-
-# Unittests
-releaseConfig['unittestPlatforms'] = ()
-releaseConfig['enableUnittests'] = False
-
-# SDK
-releaseConfig['packageSDK'] = True
-
-# L10n configuration
-releaseConfig['l10nPlatforms'] = releaseConfig['enUSPlatforms']
-releaseConfig['shippedLocalesPath'] = 'browser/locales/shipped-locales'
-releaseConfig['mergeLocales'] = True
-releaseConfig['l10nUsePymake'] = True
-releaseConfig['l10nChunks'] = 1
-
-# Mercurial account
-releaseConfig['hgUsername'] = 'stage-ffxbld'
-releaseConfig['hgSshKey'] = '/home/mock_mozilla/.ssh/ffxbld_rsa'
-
-# Update-specific configuration
-releaseConfig['ftpServer'] = 'ftp.stage.mozaws.net'
-releaseConfig['stagingServer'] = 'upload.ffxbld.productdelivery.stage.mozaws.net'
-releaseConfig['previousReleasesStagingServer'] = 'archive.mozilla.org'
-releaseConfig['S3Credentials'] = '/builds/release-s3.credentials'
-releaseConfig['S3Bucket'] = 'net-mozaws-stage-delivery-firefox'
-releaseConfig['bouncerServer'] = 'download.mozilla.org'
-releaseConfig['ausServerUrl'] = 'https://aus4-dev.allizom.org'
-releaseConfig['releaseNotesUrl'] = None
-releaseConfig['testOlderPartials'] = False
-releaseConfig['promptWaitTime'] = {{ promptWaitTime }}
-releaseConfig['updateVerifyChunks'] = 2
-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',
- #'win64': 'browser/config/mozconfigs/win64/release',
-}
-releaseConfig["releaseChannel"] = "release"
-releaseConfig['updateChannels'] = {
- "release": {
- "versionRegex": r"^\d+\.\d+(\.\d+)?$",
- "ruleId": 31,
- "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",
- "win32": "mozRelease-firefox-win32.cfg",
- #"win64": "mozRelease-firefox-win64.cfg",
- },
- "testChannels": {
- "release-localtest": {
- "ruleId": 19,
- },
- "release-cdntest": {
- "ruleId": 20,
- },
- },
- },
- "beta": {
- "enabled": {{ betaChannelEnabled }},
- # 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+)?)$",
- "ruleId": 26,
- "requiresMirrors": False,
- "patcherConfig": "mozBeta-branch-patcher2.cfg",
- "localTestChannel": "beta-localtest",
- "cdnTestChannel": "beta-cdntest",
- "verifyConfigs": {
- "linux": "beta-firefox-linux.cfg",
- "linux64": "beta-firefox-linux64.cfg",
- "macosx64": "beta-firefox-macosx64.cfg",
- "win32": "beta-firefox-win32.cfg",
- "win64": "beta-firefox-win64.cfg",
- },
- "marChannelIds": [
- "firefox-mozilla-beta",
- "firefox-mozilla-release",
- ],
- "testChannels": {
- "beta-cdntest": {
- "ruleId": 41,
- },
- "beta-localtest": {
- "ruleId": 40,
- },
- }
- }
-}
-
-# Partner repack configuration
-releaseConfig['doPartnerRepacks'] = True
-releaseConfig['partnerRepackPlatforms'] = releaseConfig['l10nPlatforms']
-releaseConfig['partnerRepackConfig'] = {
- 'use_mozharness': True,
- 'script': 'scripts/desktop_partner_repacks.py',
- 'config_file': 'partner_repacks/staging_release_mozilla-release_desktop.py',
- 's3cfg': '/builds/partners-s3cfg',
-}
-
-# Tuxedo/Bouncer configuration
-releaseConfig['tuxedoServerUrl'] = 'https://admin-bouncer.stage.mozaws.net/api'
-releaseConfig['bouncer_submitter_config'] = 'releases/bouncer_firefox_release.py'
-
-# Misc configuration
-releaseConfig['build_tools_repo_path'] = "users/stage-ffxbld/tools"
-releaseConfig['use_mock'] = True
-releaseConfig['mock_platforms'] = ('linux','linux64')
-
-releaseConfig['bouncer_aliases'] = {
- 'Firefox-%(version)s': 'firefox-latest',
- 'Firefox-%(version)s-stub': 'firefox-stub',
-}
--- a/mozilla/universal_master_sqlite.cfg
+++ b/mozilla/universal_master_sqlite.cfg
@@ -105,18 +105,16 @@ if ENABLE_RELEASES:
from buildbotcustom.process.release import generateReleaseBranchObjects
from buildbotcustom.process.release import generateReleasePromotionBuilders
# TODO remove this block when we have completely switched to release promotion
# Bug 1215865 - remove generateReleaseBranchObjects after fully porting to release promotion
for product, sourceRepoKey, productBranches, releaseBranch in \
[('thunderbird', 'comm', THUNDERBIRD_BRANCHES, b)
for b in ACTIVE_THUNDERBIRD_RELEASE_BRANCHES] + \
- [('firefox', 'mozilla', BRANCHES, b)
- for b in ACTIVE_RELEASE_BRANCHES] + \
[('fennec', 'mobile', BRANCHES, b)
for b in ACTIVE_MOBILE_RELEASE_BRANCHES]:
releaseBranchConfig = {}
releaseConfigFile = "release-%s-%s.py" % (product, releaseBranch)
execfile(releaseConfigFile, releaseBranchConfig, releaseBranchConfig)
branchConfig = productBranches[releaseBranchConfig['releaseConfig']['sourceRepositories'][sourceRepoKey]['name']]
releaseObjects = generateReleaseBranchObjects(
releaseBranchConfig['releaseConfig'], branchConfig,