--- a/mozilla/config.py
+++ b/mozilla/config.py
@@ -2285,16 +2285,28 @@ BRANCHES['mozilla-release']['push_to_rel
BRANCHES['mozilla-release']['beetmover_buckets'] = {
"firefox": "net-mozaws-prod-delivery-firefox",
"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']['signing_class'] = {
+ "firefox": "release-signing",
+ "fennec": "release-signing",
+}
+BRANCHES['mozilla-release']['signing_cert'] = {
+ "firefox": "release",
+ "fennec": "release",
+}
+BRANCHES['mozilla-release']['root_home_dir'] = {
+ "firefox": "desktop",
+ "fennec": "mobile",
+}
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": [
@@ -2409,17 +2421,18 @@ BRANCHES['mozilla-beta']['postrelease_ma
BRANCHES['mozilla-beta']['updates_config'] = {
"firefox": 'releases/updates_firefox_beta.py',
# TODO - fennec
"fennec": "",
}
BRANCHES['mozilla-beta']['beetmover_credentials'] = "/builds/release-s3.credentials"
BRANCHES['mozilla-beta']['stage_product'] = {
'firefox': 'firefox',
- 'fennec': 'mobile'
+ 'fennec': 'mobile',
+ 'devedition': 'devedition'
}
BRANCHES['mozilla-beta']['platforms']['linux']['dep_signing_servers'] = 'release-signing'
BRANCHES['mozilla-beta']['platforms']['linux64']['dep_signing_servers'] = 'release-signing'
BRANCHES['mozilla-beta']['platforms']['macosx64']['dep_signing_servers'] = 'release-signing'
BRANCHES['mozilla-beta']['platforms']['win32']['dep_signing_servers'] = 'release-signing'
BRANCHES['mozilla-beta']['platforms']['win64']['dep_signing_servers'] = 'release-signing'
BRANCHES['mozilla-beta']['platforms']['macosx64-devedition']['dep_signing_servers'] = 'nightly-signing'
BRANCHES['mozilla-beta']['platforms']['win32-devedition']['dep_signing_servers'] = 'nightly-signing'
@@ -2438,16 +2451,36 @@ BRANCHES['mozilla-beta']['release_channe
BRANCHES['mozilla-beta']['beetmover_buckets'] = {
"firefox": "net-mozaws-prod-delivery-firefox",
"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']['signing_class'] = {
+ "firefox": "release-signing",
+ "fennec": "release-signing",
+ "devedition": "nightly-signing",
+}
+BRANCHES['mozilla-beta']['signing_cert'] = {
+ "firefox": "release",
+ "fennec": "release",
+ "devedition": "nightly",
+}
+BRANCHES['mozilla-beta']['accepted_mar_channel_id'] = {
+ "firefox": "firefox-mozilla-beta",
+ "devedition": "firefox-mozilla-aurora",
+ # TODO: fennec
+}
+BRANCHES['mozilla-beta']['root_home_dir'] = {
+ "firefox": "desktop",
+ "devedition": "desktop",
+ "fennec": "mobile",
+}
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": [
@@ -2606,16 +2639,25 @@ BRANCHES['mozilla-esr45']['uptake_monito
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']['signing_class'] = {
+ "firefox": "release-signing",
+}
+BRANCHES['mozilla-esr45']['signing_cert'] = {
+ "firefox": "release",
+}
+BRANCHES['mozilla-esr45']['root_home_dir'] = {
+ "firefox": "desktop",
+}
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'] = {
@@ -2710,16 +2752,25 @@ BRANCHES['mozilla-esr52']['uptake_monito
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']['signing_class'] = {
+ "firefox": "release-signing",
+}
+BRANCHES['mozilla-esr52']['signing_cert'] = {
+ "firefox": "release",
+}
+BRANCHES['mozilla-esr52']['root_home_dir'] = {
+ "firefox": "desktop",
+}
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
--- a/mozilla/project_branches.py
+++ b/mozilla/project_branches.py
@@ -217,16 +217,32 @@ PROJECT_BRANCHES = {
'beetmover_buckets': {
'firefox': 'net-mozaws-stage-delivery-firefox',
},
'stage_product': {
'firefox': 'firefox',
'fennec': 'mobile',
'devedition': 'devedition',
},
+ 'signing_class': {
+ "firefox": "release-signing",
+ "devedition": "nightly-signing",
+ },
+ 'signing_cert': {
+ "firefox": "release",
+ "devedition": "nightly",
+ },
+ 'accepted_mar_channel_id': {
+ "firefox": "firefox-mozilla-beta",
+ "devedition": "firefox-mozilla-aurora",
+ },
+ 'root_home_dir': {
+ "firefox": "desktop",
+ "devedition": "desktop",
+ },
'enabled_products': ['firefox', 'mobile', 'devedition'],
'push_to_releases_automatic': False,
'merge_builds': False,
'snap_enabled': True,
'tc_indexes': {
"firefox": {
"linux": {
"signed": "gecko.v2.jamun.signed-nightly.revision.{rev}.firefox-l10n.linux-opt.en-US",