--- a/dev-master_config.json.in
+++ b/dev-master_config.json.in
@@ -13,16 +13,16 @@
"db_name": "dev-master1.srv.releng.scl3.mozilla.com:@BASEDIR@/master",
"enabled": true,
"environment": "staging",
"hostname": "dev-master1.srv.releng.scl3.mozilla.com",
"http_port": @HTTP_PORT@,
"master_dir": "@BASEDIR@/master",
"release_branches": ["mozilla-release", "mozilla-beta"],
"mobile_release_branches": ["mozilla-release", "mozilla-beta"],
- "thunderbird_release_branches": ["comm-beta", "comm-esr45"],
+ "thunderbird_release_branches": ["comm-beta", "comm-esr52"],
"name": "@MASTER_NAME@",
"pb_port": @PB_PORT@,
"role": "@ROLE@",
"ssh_port": @SSH_PORT@,
"tools_branch": "@TOOLS_BRANCH@",
"tools_dir": "@BASEDIR@/tools"
}]
--- a/mozilla-tests/config.py
+++ b/mozilla-tests/config.py
@@ -49,16 +49,28 @@ BRANCHES = {
'win32': {},
'win64': {},
'linux': {},
'linux64': {},
'linux64-asan': {},
},
'lock_platforms': True,
},
+ 'mozilla-esr52': {
+ 'gecko_version': 52,
+ 'platforms': {
+ 'macosx64': {},
+ 'win32': {},
+ 'win64': {},
+ 'linux': {},
+ 'linux64': {},
+ 'linux64-asan': {},
+ },
+ 'lock_platforms': True,
+ },
'try': {
'coallesce_jobs': False,
},
}
TWIGS = [x for x in ACTIVE_PROJECT_BRANCHES if x not in ('mozilla-inbound', 'larch', 'autoland')]
setMainFirefoxVersions(BRANCHES)
@@ -2389,16 +2401,27 @@ BRANCHES['mozilla-esr45']['repo_path'] =
BRANCHES['mozilla-esr45']['pgo_strategy'] = 'per-checkin'
BRANCHES['mozilla-esr45']['platforms']['win32']['talos_slave_platforms'] = []
BRANCHES['mozilla-esr45']['platforms']['macosx64']['talos_slave_platforms'] = []
BRANCHES['mozilla-esr45']['platforms']['linux']['talos_slave_platforms'] = []
BRANCHES['mozilla-esr45']['platforms']['linux64']['talos_slave_platforms'] = []
BRANCHES['mozilla-esr45']['platforms']['win32']['talos_slave_platforms'] = []
BRANCHES['mozilla-esr45']['platforms']['win64']['talos_slave_platforms'] = []
+######### mozilla-esr52
+BRANCHES['mozilla-esr52']['repo_path'] = "releases/mozilla-esr52"
+BRANCHES['mozilla-esr52']['pgo_strategy'] = 'per-checkin'
+BRANCHES['mozilla-esr52']['platforms']['win32']['talos_slave_platforms'] = []
+BRANCHES['mozilla-esr52']['platforms']['macosx64']['talos_slave_platforms'] = []
+BRANCHES['mozilla-esr52']['platforms']['linux']['talos_slave_platforms'] = []
+BRANCHES['mozilla-esr52']['platforms']['linux64']['talos_slave_platforms'] = []
+BRANCHES['mozilla-esr52']['platforms']['win32']['talos_slave_platforms'] = []
+BRANCHES['mozilla-esr52']['platforms']['win64']['talos_slave_platforms'] = []
+
+
######## try
BRANCHES['try']['repo_path'] = "try"
BRANCHES['try']['pgo_strategy'] = None
BRANCHES['try']['enable_try'] = True
BRANCHES['try']['watch_all_branches'] = True
######### elm--- a/mozilla-tests/production_config.py
+++ b/mozilla-tests/production_config.py
@@ -10,17 +10,17 @@ SLAVES = {
'ubuntu64_vm': {},
'ubuntu64_vm_large': {},
'ubuntu64_vm_lnx_large': {},
'ubuntu64-asan_vm_lnx_large': {},
'ubuntu64_hw': {},
'win64_vm': {},
}
-for i in range(1, 41): # Bug 1297173 // Bug 1299468 // Bug 1317723 //Bug 1337394
+for i in range(1, 41): # Bug 1297173 // Bug 1299468 // Bug 1317723 //Bug 1337394
SLAVES['xp_ix']['t-xp32-ix-%03i' % i] = {}
for i in range(1, 151): # Move 111 machines from Windows 7 pool to Windows XP and Windows 8 // Bug 1297173 // Bug 1299468
SLAVES['win7_ix']['t-w732-ix-%03i' % i] = {}
for i in range(1, 101) + range(102, 600): # Omit 101 due to win7 golden issues // Bug 1223509
SLAVES['win7_vm']['t-w732-spot-%03i' % i] = {}
@@ -44,17 +44,17 @@ for i in range(1, 800) + range(1000, 110
SLAVES['ubuntu32_vm']['tst-linux32-spot-%03i' % i] = {}
for i in range(1, 200) + range(301, 500) + range(601, 800) + range(901, 1100) + range(1201, 1452): # Bug 1252248
SLAVES['ubuntu64_vm_large']['tst-emulator64-spot-%03i' % i] = {}
for i in range(1, 2601): # Bug 1252248
SLAVES['ubuntu64_vm']['tst-linux64-spot-%03i' % i] = {}
-for i in range(1, 90): #Bug 1337394
+for i in range(1, 90): #Bug 1337394
SLAVES['ubuntu64_hw']['talos-linux64-ix-%03i' % i] = {}
for i in range(1, 3):
SLAVES['win64_vm']['tst-w64-ec2-%03i' % i] = {}
SLAVES['ubuntu64-asan_vm'] = SLAVES['ubuntu64_vm']
SLAVES['win8_64'] = SLAVES['win8']
SLAVES['ubuntu64_vm_mobile'] = SLAVES['ubuntu64_vm']
@@ -88,16 +88,20 @@ BRANCHES = {
'mozilla-release': {
'tinderbox_tree': 'Mozilla-Release',
'mobile_tinderbox_tree': 'Mozilla-Release',
},
'mozilla-esr45': {
'tinderbox_tree': 'Mozilla-Esr45',
'mobile_tinderbox_tree': 'Mozilla-Esr45',
},
+ 'mozilla-esr52': {
+ 'tinderbox_tree': 'Mozilla-Esr52',
+ 'mobile_tinderbox_tree': 'Mozilla-Esr52',
+ },
'mozilla-beta': {
'tinderbox_tree': 'Mozilla-Beta',
'mobile_tinderbox_tree': 'Mozilla-Beta',
},
'mozilla-aurora': {
'tinderbox_tree': 'Mozilla-Aurora',
'mobile_tinderbox_tree': 'Mozilla-Aurora',
},--- a/mozilla-tests/thunderbird_config.py
+++ b/mozilla-tests/thunderbird_config.py
@@ -27,16 +27,19 @@ BRANCHES = {
},
'comm-beta': {
},
'comm-aurora': {
},
'comm-esr45': {
'gecko_version': 45
},
+ 'comm-esr52': {
+ 'gecko_version': 52
+ },
'try-comm-central': {
'coallesce_jobs': False
},
}
setMainCommVersions(BRANCHES)
PLATFORMS = {
@@ -380,16 +383,21 @@ BRANCHES['comm-aurora']['pgo_strategy']
BRANCHES['comm-aurora']['repo_path'] = "releases/comm-aurora"
BRANCHES['comm-aurora']['moz_repo_path'] = "releases/mozilla-aurora"
######## comm-esr45
BRANCHES['comm-esr45']['pgo_strategy'] = None
BRANCHES['comm-esr45']['repo_path'] = "releases/comm-esr45"
BRANCHES['comm-esr45']['moz_repo_path'] = "releases/mozilla-esr45"
+######## comm-esr52
+BRANCHES['comm-esr52']['pgo_strategy'] = None
+BRANCHES['comm-esr52']['repo_path'] = "releases/comm-esr52"
+BRANCHES['comm-esr52']['moz_repo_path'] = "releases/mozilla-esr52"
+
######## try
BRANCHES['try-comm-central']['enable_try'] = True
BRANCHES['try-comm-central']['watch_all_branches'] = True
BRANCHES['try-comm-central']['moz_repo_path'] = "mozilla-central"
# Disable Rev3 winxp and win7 machines for all branches
for branch in set(BRANCHES.keys()):
if 'win32' not in BRANCHES[branch]['platforms']:--- a/mozilla-tests/thunderbird_production_config.py
+++ b/mozilla-tests/thunderbird_production_config.py
@@ -12,16 +12,19 @@ GLOBAL_VARS['stage_ssh_key'] = 'tbirdbld
# Local branch overrides
BRANCHES = {
'comm-central': {
'tinderbox_tree': 'Thunderbird',
},
'comm-esr45': {
'tinderbox_tree': 'Thunderbird-Esr45',
},
+ 'comm-esr52': {
+ 'tinderbox_tree': 'Thunderbird-Esr52',
+ },
'comm-beta': {
'tinderbox_tree': 'Thunderbird-Beta',
},
'comm-aurora': {
'tinderbox_tree': 'Thunderbird-Aurora',
},
'try-comm-central': {
'tinderbox_tree': 'Try-Comm-Central',--- a/mozilla/build_localconfig.py
+++ b/mozilla/build_localconfig.py
@@ -26,26 +26,28 @@ if 'limit_branches' in master_config:
else:
ACTIVE_BRANCHES = ACTIVE_PROJECT_BRANCHES[:]
ACTIVE_BRANCHES.extend([
'mozilla-central',
'mozilla-beta',
'mozilla-aurora',
'mozilla-release',
'mozilla-esr45',
+ 'mozilla-esr52',
])
if 'limit_tb_branches' in master_config:
ACTIVE_THUNDERBIRD_BRANCHES = [x.encode("utf-8") for x in master_config['limit_tb_branches']]
else:
ACTIVE_THUNDERBIRD_BRANCHES = ACTIVE_THUNDERBIRD_PROJECT_BRANCHES[:]
ACTIVE_THUNDERBIRD_BRANCHES.extend([
'comm-central',
'comm-beta',
'comm-aurora',
'comm-esr45',
+ 'comm-esr52',
])
if 'limit_projects' in master_config:
ACTIVE_PROJECTS = [x.encode("utf-8") for x in master_config['limit_projects']]
else:
ACTIVE_PROJECTS = PROJECTS.keys()
ACTIVE_PROJECTS = [p for p in ACTIVE_PROJECTS if not PROJECTS[p].get('enable_try')]
if 'limit_branch_projects' in master_config:--- a/mozilla/config.py
+++ b/mozilla/config.py
@@ -1964,16 +1964,35 @@ BRANCHES = {
'linux64-av': {},
'linux-debug': {},
'linux64-debug': {},
'macosx64-debug': {},
'win32-debug': {},
'win64-debug': {},
},
},
+ 'mozilla-esr52': {
+ 'merge_builds': False,
+ 'lock_platforms': True,
+ 'gecko_version': 52,
+ 'platforms': {
+ 'linux': {},
+ 'linux64': {},
+ 'macosx64': {},
+ 'win32': {},
+ 'win64': {},
+ 'linux64-asan': {},
+ 'linux64-av': {},
+ 'linux-debug': {},
+ 'linux64-debug': {},
+ 'macosx64-debug': {},
+ 'win32-debug': {},
+ 'win64-debug': {},
+ },
+ },
'try': {
'branch_projects': ['spidermonkey_try'],
# The following platforms are not part of the default set,
# so only run on Try.
'extra_platforms': {
},
},
}
@@ -2200,17 +2219,16 @@ BRANCHES['mozilla-release']['beetmover_b
"firefox": "net-mozaws-prod-delivery-firefox",
# TODO - add fennec support
# 'fennec': 'net-mozaws-prod-delivery-archive',
}
BRANCHES['mozilla-release']['release_platforms'] = ("linux", "linux64", "win32", "win64", "macosx64")
BRANCHES['mozilla-release']['l10n_release_platforms'] = ("linux", "linux64", "win32", "win64", "macosx64")
BRANCHES['mozilla-release']['partner_repacks_platforms'] = ("linux", "linux64", "win32", "win64", "macosx64")
BRANCHES['mozilla-release']['eme_free_repacks_platforms'] = ("linux", "linux64", "win32", "win64", "macosx64")
-BRANCHES['mozilla-release']['sha1_repacks_platforms'] = ("win32",)
BRANCHES['mozilla-release']['partner_repack_config'] = {
"firefox": {
"script_name": "scripts/desktop_partner_repacks.py",
"extra_args": [
"--cfg", "partner_repacks/release_mozilla-release_desktop.py",
"--s3cfg", "/builds/partners-s3cfg",
],
},
@@ -2351,17 +2369,16 @@ BRANCHES['mozilla-beta']['beetmover_buck
"firefox": "net-mozaws-prod-delivery-firefox",
# TODO - add fennec support
# 'fennec': 'net-mozaws-prod-delivery-archive',
}
BRANCHES['mozilla-beta']['release_platforms'] = ("linux", "linux64", "win32", "win64", "macosx64")
BRANCHES['mozilla-beta']['l10n_release_platforms'] = ("linux", "linux64", "win32", "win64", "macosx64")
BRANCHES['mozilla-beta']['partner_repacks_platforms'] = ("linux", "linux64", "win32", "win64", "macosx64")
BRANCHES['mozilla-beta']['eme_free_repacks_platforms'] = ("linux", "linux64", "win32", "win64", "macosx64")
-BRANCHES['mozilla-beta']['sha1_repacks_platforms'] = ("win32",)
BRANCHES['mozilla-beta']['partner_repack_config'] = {
"firefox": {
"script_name": "scripts/desktop_partner_repacks.py",
"extra_args": [
"--cfg", "partner_repacks/release_mozilla-release_desktop.py",
"--s3cfg", "/builds/partners-s3cfg",
],
},
@@ -2504,17 +2521,17 @@ BRANCHES['mozilla-esr45']['stage_product
BRANCHES['mozilla-esr45']['platforms']['linux']['dep_signing_servers'] = 'release-signing'
BRANCHES['mozilla-esr45']['platforms']['linux64']['dep_signing_servers'] = 'release-signing'
BRANCHES['mozilla-esr45']['platforms']['macosx64']['dep_signing_servers'] = 'release-signing'
BRANCHES['mozilla-esr45']['platforms']['win32']['dep_signing_servers'] = 'release-signing'
BRANCHES['mozilla-esr45']['platforms']['win64']['dep_signing_servers'] = 'release-signing'
# used by releasetasks
BRANCHES['mozilla-esr45']['bouncer_enabled'] = True
BRANCHES['mozilla-esr45']['postrelease_version_bump_enabled'] = True
-BRANCHES['mozilla-esr45']['postrelease_bouncer_aliases_enabled'] = True
+BRANCHES['mozilla-esr45']['postrelease_bouncer_aliases_enabled'] = False
BRANCHES['mozilla-esr45']['postrelease_mark_as_shipped_enabled'] = True
BRANCHES['mozilla-esr45']['uptake_monitoring_enabled'] = True
BRANCHES['mozilla-esr45']['push_to_candidates_enabled'] = True
BRANCHES['mozilla-esr45']['push_to_releases_automatic'] = False
BRANCHES['mozilla-esr45']['beetmover_buckets'] = {
"firefox": "net-mozaws-prod-delivery-firefox",
}
BRANCHES['mozilla-esr45']['release_platforms'] = ("linux", "linux64", "win32", "win64", "macosx64")
@@ -2545,16 +2562,100 @@ BRANCHES['mozilla-esr45']['tc_indexes']
"win64": {
"signed": "gecko.v2.mozilla-esr45.revision.{rev}.firefox.win64-opt",
"unsigned": "gecko.v2.mozilla-esr45.revision.{rev}.firefox.win64-opt",
},
},
# TODO: fennec
}
+######## mozilla-esr52
+BRANCHES['mozilla-esr52']['repo_path'] = 'releases/mozilla-esr52'
+BRANCHES['mozilla-esr52']['update_channel'] = 'esr'
+BRANCHES['mozilla-esr52']['l10n_repo_path'] = 'releases/l10n/mozilla-release'
+BRANCHES['mozilla-esr52']['start_hour'] = [0]
+BRANCHES['mozilla-esr52']['start_minute'] = [15]
+BRANCHES['mozilla-esr52']['pgo_strategy'] = 'per-checkin'
+BRANCHES['mozilla-esr52']['enable_mac_a11y'] = True
+BRANCHES['mozilla-esr52']['platforms']['macosx64']['platform_objdir'] = "%s/x86_64" % OBJDIR
+# L10n configuration
+BRANCHES['mozilla-esr52']['enable_l10n'] = False
+BRANCHES['mozilla-esr52']['l10nNightlyUpdate'] = False
+BRANCHES['mozilla-esr52']['l10n_platforms'] = ['linux', 'linux64', 'win32', 'macosx64', 'win64']
+BRANCHES['mozilla-esr52']['l10nDatedDirs'] = True
+BRANCHES['mozilla-esr52']['l10n_tree'] = 'fxesr52'
+BRANCHES['mozilla-esr52']['enUS_binaryURL'] = \
+ GLOBAL_VARS['download_base_url'] + '/nightly/latest-mozilla-esr52'
+BRANCHES['mozilla-esr52']['enable_nightly'] = False
+BRANCHES['mozilla-esr52']['enable_nightly_everytime'] = False
+BRANCHES['mozilla-esr52']['updates_enabled'] = False
+BRANCHES['mozilla-esr52']['create_partial'] = False
+BRANCHES['mozilla-esr52']['enable_blocklist_update'] = True
+BRANCHES['mozilla-esr52']['enable_hsts_update'] = True
+BRANCHES['mozilla-esr52']['enable_hpkp_update'] = True
+BRANCHES['mozilla-esr52']['enabled_products'] = ['firefox']
+### Release Promotion
+BRANCHES['mozilla-esr52']['enable_release_promotion'] = True
+# used by process/release.py
+BRANCHES['mozilla-esr52']['tuxedoServerUrl'] = "https://bounceradmin.mozilla.com/api"
+BRANCHES['mozilla-esr52']['bouncer_submitter_config'] = {
+ "firefox": "releases/bouncer_firefox_esr.py",
+}
+BRANCHES['mozilla-esr52']['uptake_monitoring_config'] = {
+ "firefox": 'releases/bouncer_firefox_esr.py',
+}
+BRANCHES['mozilla-esr52']['postrelease_version_bump_config'] = {
+ "firefox": 'releases/postrelease_firefox_esr52.py',
+}
+BRANCHES['mozilla-esr52']['postrelease_bouncer_aliases_config'] = {
+ "firefox": 'releases/bouncer_firefox_esr.py',
+}
+BRANCHES['mozilla-esr52']['postrelease_mark_as_shipped_config'] = {
+ "firefox": 'releases/postrelease_firefox_esr52.py',
+}
+BRANCHES['mozilla-esr52']['updates_config'] = {
+ "firefox": 'releases/updates_firefox_esr52.py',
+}
+BRANCHES['mozilla-esr52']['beetmover_credentials'] = "/builds/release-s3.credentials"
+BRANCHES['mozilla-esr52']['stage_product'] = {
+ 'firefox': 'firefox',
+}
+BRANCHES['mozilla-esr52']['platforms']['linux']['dep_signing_servers'] = 'release-signing'
+BRANCHES['mozilla-esr52']['platforms']['linux64']['dep_signing_servers'] = 'release-signing'
+BRANCHES['mozilla-esr52']['platforms']['macosx64']['dep_signing_servers'] = 'release-signing'
+BRANCHES['mozilla-esr52']['platforms']['win32']['dep_signing_servers'] = 'release-signing'
+BRANCHES['mozilla-esr52']['platforms']['win64']['dep_signing_servers'] = 'release-signing'
+# used by releasetasks
+BRANCHES['mozilla-esr52']['bouncer_enabled'] = True
+BRANCHES['mozilla-esr52']['postrelease_version_bump_enabled'] = True
+BRANCHES['mozilla-esr52']['postrelease_bouncer_aliases_enabled'] = True
+BRANCHES['mozilla-esr52']['postrelease_mark_as_shipped_enabled'] = True
+BRANCHES['mozilla-esr52']['uptake_monitoring_enabled'] = True
+BRANCHES['mozilla-esr52']['push_to_candidates_enabled'] = True
+BRANCHES['mozilla-esr52']['push_to_releases_automatic'] = False
+BRANCHES['mozilla-esr52']['beetmover_buckets'] = {
+ "firefox": "net-mozaws-prod-delivery-firefox",
+}
+BRANCHES['mozilla-esr52']['release_platforms'] = ("linux", "linux64", "win32", "win64", "macosx64")
+BRANCHES['mozilla-esr52']['l10n_release_platforms'] = ("linux", "linux64", "win32", "win64", "macosx64")
+BRANCHES['mozilla-esr52']['updates_builder_enabled'] = True
+BRANCHES['mozilla-esr52']['update_verify_enabled'] = True
+BRANCHES['mozilla-esr52']['release_channel_mappings'] = [["^.*$", ["esr"]]]
+BRANCHES['mozilla-esr52']['snap_enabled'] = False
+BRANCHES['mozilla-esr52']['sha1_repacks_platforms'] = ("win32",)
+BRANCHES['mozilla-esr52']['partner_repack_config'] = {
+ "firefox": {
+ "script_name": "scripts/desktop_partner_repacks.py",
+ "extra_args": [
+ "--cfg", "partner_repacks/release_mozilla-esr52_desktop.py",
+ "--s3cfg", "/builds/partners-s3cfg",
+ ],
+ },
+}
+
######## try
# Try-specific configs
BRANCHES['try']['l10n_repo_path'] = 'l10n-central'
BRANCHES['try']['stage_username'] = 'trybld'
BRANCHES['try']['stage_username_mobile'] = 'trybld'
BRANCHES['try']['stage_ssh_key'] = 'trybld_dsa'
BRANCHES['try']['stage_ssh_mobile_key'] = 'trybld_dsa'
BRANCHES['try']['stage_base_path'] = '/home/ftp/pub/firefox/try-builds'
@@ -2695,17 +2796,17 @@ mc_gecko_version = BRANCHES['mozilla-cen
for name, branch in items_before(BRANCHES, 'gecko_version', mc_gecko_version):
if 'linux64-st-an-debug' in branch['platforms']:
del branch['platforms']['linux64-st-an-debug']
if 'macosx64-st-an-debug' in branch['platforms']:
del branch['platforms']['macosx64-st-an-debug']
# Only test pretty names on train branches, not m-c or project branches.
for branch in ("mozilla-aurora", "mozilla-beta", "mozilla-release",
- "mozilla-esr45"):
+ "mozilla-esr52"):
for platform in ("linux", "linux64", "macosx64", "win32", "win64"):
if platform in BRANCHES[branch]['platforms']:
BRANCHES[branch]['platforms'][platform]['test_pretty_names'] = True
# enable mozharness desktop builds on 45.0 and higher
for name, branch in items_at_least(BRANCHES, 'gecko_version', 45):
# if true, any platform with mozharness_desktop_build in its config
# will use mozharness instead of MozillaBuildFactory
@@ -2748,17 +2849,17 @@ mr_gecko_version = BRANCHES['mozilla-rel
# 2) rm all no-add-on-sign builds from any branch at least m-r's gecko_version
# Note: for now, we will lock this to m-b but eventually we will want to replace mr_gecko_version
# with a static version so that this can ride the trains to esr
for name, branch in items_before(BRANCHES, 'gecko_version', mr_gecko_version):
for platform in ['linux64-add-on-devel', 'macosx64-add-on-devel', 'win32-add-on-devel', 'win64-add-on-devel']:
if platform in branch['platforms']:
del branch['platforms'][platform]
for name, branch in items_at_least(BRANCHES, 'gecko_version', mr_gecko_version):
- if name in ['mozilla-beta', 'mozilla-release', 'mozilla-esr45']:
+ if name in ['mozilla-beta', 'mozilla-release', 'mozilla-esr45', 'mozilla-esr52']:
continue
else:
for platform in ['linux64-add-on-devel', 'macosx64-add-on-devel', 'win32-add-on-devel', 'win64-add-on-devel']:
if platform in branch['platforms']:
del branch['platforms'][platform]
# Bug 1293730 - Fennec x86 builds as tier 1
for name, branch in items_at_least(BRANCHES, 'gecko_version', 51):--- a/mozilla/master_common.py
+++ b/mozilla/master_common.py
@@ -20,17 +20,19 @@ c['schedulers'] = []
c['change_source'] = []
# Builders from these branches are given custom priority, default is 4 for unlisted branches
# Please leave in sorted order
DEFAULT_BRANCH_PRIORITY = 4
BRANCH_PRIORITIES = {
'mozilla-release': 0,
'comm-esr45': 0,
+ 'comm-esr52': 0,
'mozilla-esr45': 1,
+ 'mozilla-esr52': 1,
'mozilla-beta': 2,
'comm-beta': 2,
'mozilla-central': 3,
'comm-central': 3,
'mozilla-aurora': 3,
'comm-aurora': 3,
# Unlisted branches are prioritized at this level
'autoland': 4,--- a/mozilla/production_config.py
+++ b/mozilla/production_config.py
@@ -87,16 +87,20 @@ BRANCHES = {
'mozilla-release': {
'tinderbox_tree': 'Mozilla-Release',
'mobile_tinderbox_tree': 'Mozilla-Release',
},
'mozilla-esr45': {
'tinderbox_tree': 'Mozilla-Esr45',
'mobile_tinderbox_tree': 'Mozilla-Esr45',
},
+ 'mozilla-esr52': {
+ 'tinderbox_tree': 'Mozilla-Esr52',
+ 'mobile_tinderbox_tree': 'Mozilla-Esr52',
+ },
'mozilla-beta': {
'tinderbox_tree': 'Mozilla-Beta',
'mobile_tinderbox_tree': 'Mozilla-Beta',
},
'mozilla-aurora': {
'tinderbox_tree': 'Mozilla-Aurora',
'mobile_tinderbox_tree': 'Mozilla-Aurora',
},--- a/mozilla/release-fennec-mozilla-beta.py
+++ b/mozilla/release-fennec-mozilla-beta.py
@@ -84,17 +84,16 @@ releaseConfig['hgSshKey'] = '
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-archive'
releaseConfig['ausServerUrl'] = 'https://aus4.mozilla.org'
# Partner repack configuration
releaseConfig['doPartnerRepacks'] = False
-releaseConfig['partnersRepoPath'] = 'build/partner-repacks'
releaseConfig['partnerRepackPlatforms'] = ()
# mozconfigs
releaseConfig['mozconfigs'] = {
'android-api-15': 'mobile/android/config/mozconfigs/android-api-15/release',
'android-x86': 'mobile/android/config/mozconfigs/android-x86/release',
}
releaseConfig['source_mozconfig'] = 'browser/config/mozconfigs/linux64/source'
@@ -156,9 +155,9 @@ releaseConfig['partialUpdates'] = {
releaseConfig['bouncerServer'] = 'download.mozilla.org'
# Tuxedo/Bouncer configuration
releaseConfig['tuxedoServerUrl'] = 'https://bounceradmin.mozilla.com/api'
releaseConfig['bouncer_submitter_config'] = 'releases/bouncer_fennec.py'
releaseConfig['bouncerServer'] = 'download.mozilla.org'
releaseConfig['bouncer_aliases'] = {
'Fennec-%(version)s': 'fennec-beta-latest',
}
-releaseConfig['skip_updates'] = True
\ No newline at end of file
+releaseConfig['skip_updates'] = True--- a/mozilla/release-fennec-mozilla-beta.py.template
+++ b/mozilla/release-fennec-mozilla-beta.py.template
@@ -84,17 +84,16 @@ releaseConfig['hgSshKey'] = '
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-archive'
releaseConfig['ausServerUrl'] = 'https://aus4.mozilla.org'
# Partner repack configuration
releaseConfig['doPartnerRepacks'] = False
-releaseConfig['partnersRepoPath'] = 'build/partner-repacks'
releaseConfig['partnerRepackPlatforms'] = ()
# mozconfigs
releaseConfig['mozconfigs'] = {
'android-api-15': 'mobile/android/config/mozconfigs/android-api-15/release',
'android-x86': 'mobile/android/config/mozconfigs/android-x86/release',
}
releaseConfig['source_mozconfig'] = 'browser/config/mozconfigs/linux64/source'--- a/mozilla/release-fennec-mozilla-release.py
+++ b/mozilla/release-fennec-mozilla-release.py
@@ -84,17 +84,16 @@ releaseConfig['hgSshKey'] = '
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-archive'
releaseConfig['ausServerUrl'] = 'https://aus4.mozilla.org'
# Partner repack configuration
releaseConfig['doPartnerRepacks'] = True
-releaseConfig['partnersRepoPath'] = 'build/partner-repacks'
releaseConfig['partnerRepackPlatforms'] = ()
releaseConfig['partnerRepackConfig'] = {
'use_mozharness': True,
'platforms': {
'android': {
'script': 'scripts/mobile_partner_repack.py',
'config_file': 'partner_repacks/release_mozilla-release_android.py',
},
@@ -164,9 +163,9 @@ releaseConfig['partialUpdates'] = {
releaseConfig['bouncerServer'] = 'download.mozilla.org'
releaseConfig['tuxedoServerUrl'] = 'https://bounceradmin.mozilla.com/api'
releaseConfig['bouncer_submitter_config'] = 'releases/bouncer_fennec.py'
releaseConfig['bouncerServer'] = 'download.mozilla.org'
releaseConfig['bouncer_aliases'] = {
'Fennec-%(version)s': 'fennec-latest',
}
-releaseConfig['skip_updates'] = True
\ No newline at end of file
+releaseConfig['skip_updates'] = True--- a/mozilla/release-fennec-mozilla-release.py.template
+++ b/mozilla/release-fennec-mozilla-release.py.template
@@ -84,17 +84,16 @@ releaseConfig['hgSshKey'] = '
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-archive'
releaseConfig['ausServerUrl'] = 'https://aus4.mozilla.org'
# Partner repack configuration
releaseConfig['doPartnerRepacks'] = True
-releaseConfig['partnersRepoPath'] = 'build/partner-repacks'
releaseConfig['partnerRepackPlatforms'] = ()
releaseConfig['partnerRepackConfig'] = {
'use_mozharness': True,
'platforms': {
'android': {
'script': 'scripts/mobile_partner_repack.py',
'config_file': 'partner_repacks/release_mozilla-release_android.py',
},--- a/mozilla/release-thunderbird-comm-beta.py
+++ b/mozilla/release-thunderbird-comm-beta.py
@@ -148,22 +148,21 @@ releaseConfig['updateChannels'] = {
},
}
}
}
# 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_thunderbird.py'
releaseConfig['bouncer_aliases'] = {
'Thunderbird-%(version)s': 'thunderbird-beta-latest',
}
# Misc configuration
releaseConfig['enableAutomaticPushToMirrors'] = True
releaseConfig['use_mock'] = True
releaseConfig['mock_platforms'] = ('linux','linux64')
-releaseConfig['extra_signing_env'] = {'TOOLTOOL_DIR': '%(basedir)s/comm-beta'}
\ No newline at end of file
+releaseConfig['extra_signing_env'] = {'TOOLTOOL_DIR': '%(basedir)s/comm-beta'}--- a/mozilla/release-thunderbird-comm-beta.py.template
+++ b/mozilla/release-thunderbird-comm-beta.py.template
@@ -142,17 +142,16 @@ releaseConfig['updateChannels'] = {
},
}
}
}
# 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_thunderbird.py'
releaseConfig['bouncer_aliases'] = {
'Thunderbird-%(version)s': 'thunderbird-beta-latest',
}
--- a/mozilla/release-thunderbird-comm-esr45.py
+++ b/mozilla/release-thunderbird-comm-esr45.py
@@ -149,20 +149,19 @@ releaseConfig['updateChannels'] = {
"ruleId": 334,
},
},
},
}
# 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_thunderbird.py'
releaseConfig['bouncer_aliases'] = {
'Thunderbird-%(version)s': 'thunderbird-latest',
}
# Misc configuration
releaseConfig['use_mock'] = True
-releaseConfig['mock_platforms'] = ('linux','linux64')
\ No newline at end of file
+releaseConfig['mock_platforms'] = ('linux','linux64')--- a/mozilla/release-thunderbird-comm-esr45.py.template
+++ b/mozilla/release-thunderbird-comm-esr45.py.template
@@ -137,20 +137,16 @@ releaseConfig['updateChannels'] = {
"ruleId": 334,
},
},
},
}
# 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_thunderbird.py'
-releaseConfig['bouncer_aliases'] = {
- 'Thunderbird-%(version)s': 'thunderbird-latest',
-}
# Misc configuration
releaseConfig['use_mock'] = True
releaseConfig['mock_platforms'] = ('linux','linux64')copy from mozilla/release-thunderbird-comm-esr45.py
copy to mozilla/release-thunderbird-comm-esr52.py
--- a/mozilla/release-thunderbird-comm-esr45.py
+++ b/mozilla/release-thunderbird-comm-esr52.py
@@ -1,9 +1,10 @@
# ATTENTION:
+# This file will be regenerated by release automation
# 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'
@@ -50,44 +51,44 @@ releaseConfig['partialUpdates'] = {
}
# Next (nightly) version info
releaseConfig['nextAppVersion'] = releaseConfig['appVersion']
releaseConfig['nextMilestone'] = releaseConfig['milestone']
# Repository configuration, for tagging
releaseConfig['sourceRepositories'] = {
'comm': {
- 'name': 'comm-esr45',
- 'path': 'releases/comm-esr45',
+ 'name': 'comm-esr52',
+ 'path': 'releases/comm-esr52',
'revision': '6811cb04c86f',
'relbranch': None,
'bumpFiles': {
'mail/config/version.txt': {
'version': releaseConfig['appVersion'],
'nextVersion': releaseConfig['nextAppVersion']
},
}
},
'mozilla': {
- 'name': 'mozilla-esr45',
- 'path': 'releases/mozilla-esr45',
+ 'name': 'mozilla-esr52',
+ 'path': 'releases/mozilla-esr52',
'revision': 'eb6f18dbfe8d',
'relbranch': None,
'bumpFiles': {
'config/milestone.txt': {
'version': releaseConfig['milestone'],
'nextVersion': releaseConfig['nextMilestone']
},
}
}
}
# L10n repositories
releaseConfig['l10nRelbranch'] = None
releaseConfig['l10nRepoPath'] = 'releases/l10n/mozilla-release'
-releaseConfig['l10nRevisionFile'] = 'l10n-changesets_thunderbird-esr45'
+releaseConfig['l10nRevisionFile'] = 'l10n-changesets_thunderbird-esr52'
# Support repositories
releaseConfig['otherReposToTag'] = {
'build/compare-locales': 'RELEASE_AUTOMATION',
'build/buildbot': 'production-0.8',
}
# Platform configuration
releaseConfig['enUSPlatforms'] = ('linux', 'linux64', 'win32', 'macosx64')
@@ -126,43 +127,42 @@ releaseConfig['mozconfigs'] = {
'win32': 'mail/config/mozconfigs/win32/release',
}
releaseConfig['source_mozconfig'] = 'mail/config/mozconfigs/linux64/release'
releaseConfig['releaseChannel'] = 'release'
releaseConfig['updateChannels'] = {
# ruleId needs to be updated with the ID from AUS
"release": {
"versionRegex": r"^.*$",
- "ruleId": 332,
- "patcherConfig": "mozEsr45-thunderbird-branch-patcher2.cfg",
+ "ruleId": "thunderbird-esr52",
+ "patcherConfig": "mozEsr52-thunderbird-branch-patcher2.cfg",
"localTestChannel": "release-localtest",
"cdnTestChannel": "release-cdntest",
"verifyConfigs": {
- "linux": "mozEsr45-thunderbird-linux.cfg",
- "linux64": "mozEsr45-thunderbird-linux64.cfg",
- "macosx64": "mozEsr45-thunderbird-mac64.cfg",
- "win32": "mozEsr45-thunderbird-win32.cfg",
+ "linux": "comm-esr52-thunderbird-linux.cfg",
+ "linux64": "comm-esr52-thunderbird-linux64.cfg",
+ "macosx64": "comm-esr52-thunderbird-mac64.cfg",
+ "win32": "comm-esr52-thunderbird-win32.cfg",
},
"testChannels": {
"release-localtest": {
- "ruleId": 333,
+ "ruleId": "thunderbird-esr52-localtest",
},
"release-cdntest": {
- "ruleId": 334,
+ "ruleId": "thunderbird-esr52-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_thunderbird.py'
releaseConfig['bouncer_aliases'] = {
'Thunderbird-%(version)s': 'thunderbird-latest',
}
# Misc configuration
releaseConfig['use_mock'] = True
-releaseConfig['mock_platforms'] = ('linux','linux64')
\ No newline at end of file
+releaseConfig['mock_platforms'] = ('linux','linux64')copy from mozilla/release-thunderbird-comm-esr45.py.template
copy to mozilla/release-thunderbird-comm-esr52.py.template
--- a/mozilla/release-thunderbird-comm-esr45.py.template
+++ b/mozilla/release-thunderbird-comm-esr52.py.template
@@ -38,44 +38,44 @@ releaseConfig['partialUpdates'] = {
{% endfor %}
}
# Next (nightly) version info
releaseConfig['nextAppVersion'] = releaseConfig['appVersion']
releaseConfig['nextMilestone'] = releaseConfig['milestone']
# Repository configuration, for tagging
releaseConfig['sourceRepositories'] = {
'comm': {
- 'name': 'comm-esr45',
- 'path': 'releases/comm-esr45',
+ 'name': 'comm-esr52',
+ 'path': 'releases/comm-esr52',
'revision': '{{ commRevision }}',
'relbranch': {% if commRelbranch %}'{{ commRelbranch }}'{% else %}None{% endif %},
'bumpFiles': {
'mail/config/version.txt': {
'version': releaseConfig['appVersion'],
'nextVersion': releaseConfig['nextAppVersion']
},
}
},
'mozilla': {
- 'name': 'mozilla-esr45',
- 'path': 'releases/mozilla-esr45',
+ 'name': 'mozilla-esr52',
+ 'path': 'releases/mozilla-esr52',
'revision': '{{ mozillaRevision }}',
'relbranch': {% if mozillaRelbranch %}'{{ mozillaRelbranch }}'{% else %}None{% endif %},
'bumpFiles': {
'config/milestone.txt': {
'version': releaseConfig['milestone'],
'nextVersion': releaseConfig['nextMilestone']
},
}
}
}
# L10n repositories
releaseConfig['l10nRelbranch'] = None
releaseConfig['l10nRepoPath'] = 'releases/l10n/mozilla-release'
-releaseConfig['l10nRevisionFile'] = 'l10n-changesets_thunderbird-esr45'
+releaseConfig['l10nRevisionFile'] = 'l10n-changesets_thunderbird-esr52'
# Support repositories
releaseConfig['otherReposToTag'] = {
'build/compare-locales': 'RELEASE_AUTOMATION',
'build/buildbot': 'production-0.8',
}
# Platform configuration
releaseConfig['enUSPlatforms'] = ('linux', 'linux64', 'win32', 'macosx64')
@@ -114,40 +114,39 @@ releaseConfig['mozconfigs'] = {
'win32': 'mail/config/mozconfigs/win32/release',
}
releaseConfig['source_mozconfig'] = 'mail/config/mozconfigs/linux64/release'
releaseConfig['releaseChannel'] = 'release'
releaseConfig['updateChannels'] = {
# ruleId needs to be updated with the ID from AUS
"release": {
"versionRegex": r"^.*$",
- "ruleId": 332,
- "patcherConfig": "mozEsr45-thunderbird-branch-patcher2.cfg",
+ "ruleId": "thunderbird-esr52",
+ "patcherConfig": "mozEsr52-thunderbird-branch-patcher2.cfg",
"localTestChannel": "release-localtest",
"cdnTestChannel": "release-cdntest",
"verifyConfigs": {
- "linux": "mozEsr45-thunderbird-linux.cfg",
- "linux64": "mozEsr45-thunderbird-linux64.cfg",
- "macosx64": "mozEsr45-thunderbird-mac64.cfg",
- "win32": "mozEsr45-thunderbird-win32.cfg",
+ "linux": "comm-esr52-thunderbird-linux.cfg",
+ "linux64": "comm-esr52-thunderbird-linux64.cfg",
+ "macosx64": "comm-esr52-thunderbird-mac64.cfg",
+ "win32": "comm-esr52-thunderbird-win32.cfg",
},
"testChannels": {
"release-localtest": {
- "ruleId": 333,
+ "ruleId": "thunderbird-esr52-localtest",
},
"release-cdntest": {
- "ruleId": 334,
+ "ruleId": "thunderbird-esr52-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_thunderbird.py'
releaseConfig['bouncer_aliases'] = {
'Thunderbird-%(version)s': 'thunderbird-latest',
}
--- a/mozilla/staging_config.py
+++ b/mozilla/staging_config.py
@@ -92,16 +92,22 @@ BRANCHES = {
'file_update_on_closed_tree': False,
},
'mozilla-esr45': {
'enable_blocklist_update': False,
'enable_hsts_update': False,
'enable_hpkp_update': False,
'file_update_on_closed_tree': False,
},
+ 'mozilla-esr52': {
+ 'enable_blocklist_update': False,
+ 'enable_hsts_update': False,
+ 'enable_hpkp_update': False,
+ 'file_update_on_closed_tree': False,
+ },
'try': {
'download_base_url': 'http://dev-stage01.srv.releng.scl3.mozilla.com/pub/mozilla.org/firefox',
'mobile_download_base_url': 'http://dev-stage01.srv.releng.scl3.mozilla.com/pub/mozilla.org/mobile',
'enable_mail_notifier': False, # Set to True when testing
'email_override': [], # Set to your address when testing
'package_url': 'http://ftp.stage.mozaws.net/pub/firefox/try-builds',
'talos_masters': [],
},--- a/mozilla/staging_release-fennec-mozilla-beta.py
+++ b/mozilla/staging_release-fennec-mozilla-beta.py
@@ -87,17 +87,16 @@ releaseConfig['hgSshKey'] = '
releaseConfig['ftpServer'] = 'ftp.stage.mozaws.net'
releaseConfig['stagingServer'] = 'upload.ffxbld.productdelivery.stage.mozaws.net'
releaseConfig['S3Credentials'] = '/builds/release-s3.credentials'
releaseConfig['S3Bucket'] = 'net-mozaws-stage-delivery-archive'
releaseConfig['ausServerUrl'] = 'https://aus4-dev.allizom.org'
# Partner repack configuration
releaseConfig['doPartnerRepacks'] = False
-releaseConfig['partnersRepoPath'] = 'users/stage-ffxbld/partner-repacks'
releaseConfig['partnerRepackPlatforms'] = ()
# mozconfigs
releaseConfig['mozconfigs'] = {
'android-api-15': 'mobile/android/config/mozconfigs/android-api-15/release',
'android-x86': 'mobile/android/config/mozconfigs/android-x86/release',
}
releaseConfig['source_mozconfig'] = 'browser/config/mozconfigs/linux64/source'--- a/mozilla/staging_release-fennec-mozilla-beta.py.template
+++ b/mozilla/staging_release-fennec-mozilla-beta.py.template
@@ -87,17 +87,16 @@ releaseConfig['hgSshKey'] = '
releaseConfig['ftpServer'] = 'ftp.stage.mozaws.net'
releaseConfig['stagingServer'] = 'upload.ffxbld.productdelivery.stage.mozaws.net'
releaseConfig['S3Credentials'] = '/builds/release-s3.credentials'
releaseConfig['S3Bucket'] = 'net-mozaws-stage-delivery-archive'
releaseConfig['ausServerUrl'] = 'https://aus4-dev.allizom.org'
# Partner repack configuration
releaseConfig['doPartnerRepacks'] = False
-releaseConfig['partnersRepoPath'] = 'users/stage-ffxbld/partner-repacks'
releaseConfig['partnerRepackPlatforms'] = ()
# mozconfigs
releaseConfig['mozconfigs'] = {
'android-api-15': 'mobile/android/config/mozconfigs/android-api-15/release',
'android-x86': 'mobile/android/config/mozconfigs/android-x86/release',
}
releaseConfig['source_mozconfig'] = 'browser/config/mozconfigs/linux64/source'--- a/mozilla/staging_release-fennec-mozilla-release.py
+++ b/mozilla/staging_release-fennec-mozilla-release.py
@@ -87,17 +87,16 @@ releaseConfig['hgSshKey'] = '
releaseConfig['ftpServer'] = 'ftp.stage.mozaws.net'
releaseConfig['stagingServer'] = 'upload.ffxbld.productdelivery.stage.mozaws.net'
releaseConfig['S3Credentials'] = '/builds/release-s3.credentials'
releaseConfig['S3Bucket'] = 'net-mozaws-stage-delivery-archive'
releaseConfig['ausServerUrl'] = 'https://aus4-dev.allizom.org'
# Partner repack configuration
releaseConfig['doPartnerRepacks'] = True
-releaseConfig['partnersRepoPath'] = 'users/stage-ffxbld/partner-repacks'
releaseConfig['partnerRepackPlatforms'] = ()
releaseConfig['partnerRepackConfig'] = {
'use_mozharness': True,
'platforms': {
'android': {
'script': 'scripts/mobile_partner_repack.py',
'config_file': 'partner_repacks/staging_release_mozilla-release_android.py',
},--- a/mozilla/staging_release-fennec-mozilla-release.py.template
+++ b/mozilla/staging_release-fennec-mozilla-release.py.template
@@ -87,17 +87,16 @@ releaseConfig['hgSshKey'] = '
releaseConfig['ftpServer'] = 'ftp.stage.mozaws.net'
releaseConfig['stagingServer'] = 'upload.ffxbld.productdelivery.stage.mozaws.net'
releaseConfig['S3Credentials'] = '/builds/release-s3.credentials'
releaseConfig['S3Bucket'] = 'net-mozaws-stage-delivery-archive'
releaseConfig['ausServerUrl'] = 'https://aus4-dev.allizom.org'
# Partner repack configuration
releaseConfig['doPartnerRepacks'] = True
-releaseConfig['partnersRepoPath'] = 'users/stage-ffxbld/partner-repacks'
releaseConfig['partnerRepackPlatforms'] = ()
releaseConfig['partnerRepackConfig'] = {
'use_mozharness': True,
'platforms': {
'android': {
'script': 'scripts/mobile_partner_repack.py',
'config_file': 'partner_repacks/staging_release_mozilla-release_android.py',
},--- a/mozilla/staging_release-thunderbird-comm-beta.py
+++ b/mozilla/staging_release-thunderbird-comm-beta.py
@@ -145,17 +145,16 @@ releaseConfig['updateChannels'] = {
"ruleId": 21,
},
}
}
}
# 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_thunderbird.py'
releaseConfig['bouncer_aliases'] = {
'Thunderbird-%(version)s': 'thunderbird-beta-latest',
}
--- a/mozilla/staging_release-thunderbird-comm-beta.py.template
+++ b/mozilla/staging_release-thunderbird-comm-beta.py.template
@@ -144,17 +144,16 @@ releaseConfig['updateChannels'] = {
"ruleId": 21,
},
}
}
}
# 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_thunderbird.py'
releaseConfig['bouncer_aliases'] = {
'Thunderbird-%(version)s': 'thunderbird-beta-latest',
}
--- a/mozilla/staging_release-thunderbird-comm-esr45.py
+++ b/mozilla/staging_release-thunderbird-comm-esr45.py
@@ -140,17 +140,16 @@ releaseConfig['updateChannels'] = {
"ruleId": 62,
},
},
},
}
# 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_thunderbird.py'
releaseConfig['bouncer_aliases'] = {
'Thunderbird-%(version)s': 'thunderbird-latest',
}
--- a/mozilla/staging_release-thunderbird-comm-esr45.py.template
+++ b/mozilla/staging_release-thunderbird-comm-esr45.py.template
@@ -140,17 +140,16 @@ releaseConfig['updateChannels'] = {
"ruleId": None,
},
},
},
}
# 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_thunderbird.py'
releaseConfig['bouncer_aliases'] = {
'Thunderbird-%(version)s': 'thunderbird-latest',
}
--- a/mozilla/thunderbird_config.py
+++ b/mozilla/thunderbird_config.py
@@ -624,16 +624,19 @@ BRANCHES = {
},
'comm-aurora': {
},
'comm-beta': {
},
'comm-esr45': {
'gecko_version': 45,
},
+ 'comm-esr52': {
+ 'gecko_version': 52,
+ },
'try-comm-central': {
},
}
# Copy project branches into BRANCHES keys
for branch in ACTIVE_PROJECT_BRANCHES:
BRANCHES[branch] = deepcopy(PROJECT_BRANCHES[branch])
@@ -779,16 +782,45 @@ BRANCHES['comm-esr45']['enUS_binaryURL']
BRANCHES['comm-esr45']['localesURL'] = \
'%s/build/buildbot-configs/raw-file/production/mozilla/l10n/all-locales.comm-esr45' % (GLOBAL_VARS['hgurl'])
BRANCHES['comm-esr45']['enable_nightly'] = True
BRANCHES['comm-esr45']['updates_enabled'] = True
BRANCHES['comm-esr45']['create_partial'] = False
BRANCHES['comm-esr45']['enable_blocklist_update'] = True
BRANCHES['comm-esr45']['file_update_on_closed_tree'] = False
+######## comm-esr52
+BRANCHES['comm-esr52']['repo_path'] = 'releases/comm-esr52'
+BRANCHES['comm-esr52']['moz_repo_path'] = 'releases/mozilla-esr52'
+BRANCHES['comm-esr52']['update_channel'] = 'nightly-esr52'
+BRANCHES['comm-esr52']['skip_blank_repos'] = True
+BRANCHES['comm-esr52']['call_client_py'] = True
+BRANCHES['comm-esr52']['l10n_repo_path'] = 'releases/l10n/mozilla-release'
+BRANCHES['comm-esr52']['start_hour'] = [3]
+BRANCHES['comm-esr52']['start_minute'] = [2]
+# Enable unit tests
+BRANCHES['comm-esr52']['enable_mac_a11y'] = True
+BRANCHES['comm-esr52']['unittest_build_space'] = 6
+# L10n configuration
+BRANCHES['comm-esr52']['enable_l10n'] = False
+BRANCHES['comm-esr52']['l10nNightlyUpdate'] = False
+BRANCHES['comm-esr52']['l10n_platforms'] = ['linux', 'linux64', 'win32',
+ 'macosx64']
+BRANCHES['comm-esr52']['l10nDatedDirs'] = True
+BRANCHES['comm-esr52']['l10n_tree'] = 'tbrel'
+BRANCHES['comm-esr52']['enUS_binaryURL'] = \
+ GLOBAL_VARS['download_base_url'] + '/nightly/latest-comm-esr52'
+BRANCHES['comm-esr52']['localesURL'] = \
+ '%s/build/buildbot-configs/raw-file/production/mozilla/l10n/all-locales.comm-esr52' % (GLOBAL_VARS['hgurl'])
+BRANCHES['comm-esr52']['enable_nightly'] = True
+BRANCHES['comm-esr52']['updates_enabled'] = True
+BRANCHES['comm-esr52']['create_partial'] = False
+BRANCHES['comm-esr52']['enable_blocklist_update'] = True
+BRANCHES['comm-esr52']['file_update_on_closed_tree'] = False
+
######## comm-beta
BRANCHES['comm-beta']['moz_repo_path'] = 'releases/mozilla-beta'
BRANCHES['comm-beta']['skip_blank_repos'] = True
BRANCHES['comm-beta']['call_client_py'] = True
BRANCHES['comm-beta']['repo_path'] = 'releases/comm-beta'
BRANCHES['comm-beta']['l10n_repo_path'] = 'releases/l10n/mozilla-beta'
BRANCHES['comm-beta']['update_channel'] = 'beta'
BRANCHES['comm-beta']['start_hour'] = [3]--- a/mozilla/thunderbird_production_config.py
+++ b/mozilla/thunderbird_production_config.py
@@ -43,16 +43,19 @@ GLOBAL_VARS.update({
# Local branch overrides
BRANCHES = {
'comm-central': {
'tinderbox_tree': 'Thunderbird',
},
'comm-esr45': {
'tinderbox_tree': 'Thunderbird-Esr45',
},
+ 'comm-esr52': {
+ 'tinderbox_tree': 'Thunderbird-Esr52',
+ },
'comm-beta': {
'tinderbox_tree': 'Thunderbird-Beta',
},
'comm-aurora': {
'tinderbox_tree': 'Thunderbird-Aurora',
},
'try-comm-central': {
'stage_server': 'upload.trybld.productdelivery.prod.mozaws.net',--- a/mozilla/thunderbird_staging_config.py
+++ b/mozilla/thunderbird_staging_config.py
@@ -39,16 +39,20 @@ BRANCHES = {
'comm-aurora': {
'enable_blocklist_update': False,
'file_update_on_closed_tree': False,
},
'comm-esr45': {
'enable_blocklist_update': False,
'file_update_on_closed_tree': False,
},
+ 'comm-esr52': {
+ 'enable_blocklist_update': False,
+ 'file_update_on_closed_tree': False,
+ },
'try-comm-central': {
# all try builds go via trybld hosts
'stage_server': 'upload.trybld.productdelivery.stage.mozaws.net',
'download_base_url': 'http://ftp.stage.mozaws.net/pub/thunderbird/try-builds',
'enable_mail_notifier': False, # Set to True when testing
'email_override': [], # Set to your address when testing
'package_url': 'http://ftp.stage.mozaws.net/pub/thunderbird/try-builds',
'talos_masters': [],--- a/setup-master.py
+++ b/setup-master.py
@@ -234,27 +234,23 @@ def load_masters_json(masters_json, role
if m['role'] == 'build':
c.config_dir = 'mozilla'
c.globs.append('l10n-changesets*')
c.globs.append('release_templates')
if m['environment'] == 'staging':
c.globs.append('staging_release-*-*.py')
# release-*.py -> staging_release-*.py symlinks
c.local_links.extend(
- [('staging_release-firefox-mozilla-%s.py' % v,
- 'release-firefox-mozilla-%s.py' % v)
- for v in ['beta', 'release', 'esr45']
- ] +
[('staging_release-fennec-mozilla-%s.py' % v,
'release-fennec-mozilla-%s.py' % v)
for v in ['beta', 'release']
] +
[('staging_release-thunderbird-comm-%s.py' % v,
'release-thunderbird-comm-%s.py' % v)
- for v in ['beta', 'esr45']
+ for v in ['beta', 'esr45', 'esr52']
]
)
else:
c.globs.append('release-firefox*.py')
c.globs.append('release-fennec*.py')
c.globs.append('release-thunderbird*.py')
c.globs.append(mastercfg)
c.globs.append('build_localconfig.py')