--- a/mozilla/config.py
+++ b/mozilla/config.py
@@ -2169,18 +2169,17 @@ BRANCHES['mozilla-release']['enable_rele
BRANCHES['mozilla-release']['tuxedoServerUrl'] = "https://bounceradmin.mozilla.com/api"
BRANCHES['mozilla-release']['bouncer_submitter_config'] = {
"firefox": "releases/bouncer_firefox_release.py",
# TODO - fennec
"fennec": "",
}
BRANCHES['mozilla-release']['uptake_monitoring_config'] = {
"firefox": 'releases/bouncer_firefox_release.py',
- # TODO - fennec
- "fennec": "",
+ "fennec": 'releases/bouncer_fennec.py',
}
BRANCHES['mozilla-release']['postrelease_version_bump_config'] = {
"firefox": 'releases/postrelease_firefox_release.py',
# TODO - fennec
"fennec": "",
}
BRANCHES['mozilla-release']['postrelease_bouncer_aliases_config'] = {
"firefox": 'releases/bouncer_firefox_release.py',
@@ -2215,16 +2214,20 @@ BRANCHES['mozilla-release']['postrelease
BRANCHES['mozilla-release']['uptake_monitoring_enabled'] = True
BRANCHES['mozilla-release']['push_to_candidates_enabled'] = True
BRANCHES['mozilla-release']['push_to_releases_automatic'] = False
BRANCHES['mozilla-release']['beetmover_buckets'] = {
"firefox": "net-mozaws-prod-delivery-firefox",
# TODO - add fennec support
# 'fennec': 'net-mozaws-prod-delivery-archive',
}
+BRANCHES['mozilla-release']['uptake_monitoring_platforms'] = {
+ "firefox": ("linux", "linux64", "win32", "win64", "macosx64"),
+ "fennec": ("android-api-15", "android-x86"),
+}
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']['partner_repack_config'] = {
"firefox": {
"script_name": "scripts/desktop_partner_repacks.py",
"extra_args": [
@@ -2315,18 +2318,17 @@ BRANCHES['mozilla-beta']['enable_release
BRANCHES['mozilla-beta']['tuxedoServerUrl'] = "https://bounceradmin.mozilla.com/api"
BRANCHES['mozilla-beta']['bouncer_submitter_config'] = {
"firefox": "releases/bouncer_firefox_beta.py",
# TODO - fennec
"fennec": "",
}
BRANCHES['mozilla-beta']['uptake_monitoring_config'] = {
"firefox": 'releases/bouncer_firefox_beta.py',
- # TODO - fennec
- "fennec": "",
+ "fennec": 'releases/bouncer_fennec.py',
}
BRANCHES['mozilla-beta']['postrelease_version_bump_config'] = {
"firefox": 'releases/postrelease_firefox_beta.py',
# TODO - fennec
"fennec": "",
}
BRANCHES['mozilla-beta']['postrelease_bouncer_aliases_config'] = {
"firefox": 'releases/bouncer_firefox_beta.py',
@@ -2364,16 +2366,20 @@ BRANCHES['mozilla-beta']['uptake_monitor
BRANCHES['mozilla-beta']['push_to_candidates_enabled'] = True
BRANCHES['mozilla-beta']['push_to_releases_automatic'] = True
BRANCHES['mozilla-beta']['release_channel_mappings'] = [["^.*$", ["beta"]]]
BRANCHES['mozilla-beta']['beetmover_buckets'] = {
"firefox": "net-mozaws-prod-delivery-firefox",
# TODO - add fennec support
# 'fennec': 'net-mozaws-prod-delivery-archive',
}
+BRANCHES['mozilla-beta']['uptake_monitoring_platforms'] = {
+ "firefox": ("linux", "linux64", "win32", "win64", "macosx64"),
+ "fennec": ("android-api-15", "android-x86"),
+}
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']['partner_repack_config'] = {
"firefox": {
"script_name": "scripts/desktop_partner_repacks.py",
"extra_args": [
@@ -2528,16 +2534,19 @@ BRANCHES['mozilla-esr45']['postrelease_v
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']['uptake_monitoring_platforms'] = {
+ "firefox": ("linux", "linux64", "win32", "win64", "macosx64"),
+}
BRANCHES['mozilla-esr45']['release_platforms'] = ("linux", "linux64", "win32", "win64", "macosx64")
BRANCHES['mozilla-esr45']['l10n_release_platforms'] = ("linux", "linux64", "win32", "win64", "macosx64")
BRANCHES['mozilla-esr45']['updates_builder_enabled'] = True
BRANCHES['mozilla-esr45']['update_verify_enabled'] = True
BRANCHES['mozilla-esr45']['release_channel_mappings'] = [["^.*$", ["esr"]]]
BRANCHES['mozilla-esr45']['snap_enabled'] = False
# platform to TC index mapping to help finding prmotable CI builds
BRANCHES['mozilla-esr45']['tc_indexes'] = {
@@ -2628,16 +2637,19 @@ BRANCHES['mozilla-esr52']['postrelease_v
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']['uptake_monitoring_platforms'] = {
+ "firefox": ("linux", "linux64", "win32", "win64", "macosx64"),
+}
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
# Bug 1342117, CI builds on all named branches
BRANCHES['mozilla-esr52']['watch_all_branches'] = True