Bug 1414953 - enable partner repacks on maple, r=bhearsum
authorNick Thomas <nthomas@mozilla.com>
Wed, 29 Nov 2017 10:43:59 +1300
changeset 15629 9dd25c1371175aa69ca6a114a74ec944b4a63500
parent 15628 c15e3f7e19108785730a806266908de6df52adc2
child 15630 9db3292e77a42a928277d0aec765d7925d3079f2
push id209
push userbmo:mtabara@mozilla.com
push dateSun, 03 Dec 2017 18:41:38 +0000
reviewersbhearsum
bugs1414953
Bug 1414953 - enable partner repacks on maple, r=bhearsum
mozilla/config.py
mozilla/project_branches.py
--- a/mozilla/config.py
+++ b/mozilla/config.py
@@ -2095,17 +2095,17 @@ BRANCHES['mozilla-release']['root_home_d
     "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'] = {
     "firefox": ("linux", "linux64", "win32", "win64", "macosx64")
 }
 BRANCHES['mozilla-release']['eme_free_repacks_platforms'] = {
-    "firefox": ("linux", "linux64", "win32", "win64", "macosx64")
+    "firefox": ("win32", "win64", "macosx64")
 }
 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",
         ],
@@ -2311,17 +2311,17 @@ BRANCHES['mozilla-beta']['root_home_dir'
     "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'] = {
     "firefox": ("linux", "linux64", "win32", "win64", "macosx64")
 }
 BRANCHES['mozilla-beta']['eme_free_repacks_platforms'] = {
-    "firefox": ("linux", "linux64", "win32", "win64", "macosx64")
+    "firefox": ("win32", "win64", "macosx64")
 }
 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",
         ],
--- a/mozilla/project_branches.py
+++ b/mozilla/project_branches.py
@@ -153,16 +153,31 @@ PROJECT_BRANCHES = {
         },
         'build_tools_repo_path': 'users/asasaki_mozilla.com/tools',
         "release_platforms": ("linux", "linux64", "win32", "win64", "macosx64"),
         "l10n_release_platforms": ("linux", "linux64", "win32", "win64", "macosx64"),
         "single_locale_branch_config": {
             "firefox": "dev-mozilla-beta",
             "devedition": "dev-mozilla-beta_devedition",
         },
+        "partner_repacks_platforms": {
+            "firefox": ("linux", "linux64", "win32", "win64", "macosx64")
+        },
+        "eme_free_repacks_platforms": {
+            "firefox": ("win32", "win64", "macosx64")
+        },
+        "partner_repack_config": {
+            "firefox": {
+                "script_name": "scripts/desktop_partner_repacks.py",
+                "extra_args": [
+                    "--cfg", "partner_repacks/release_mozilla-release_desktop.py",
+                    "--s3cfg", "NO_UPLOADS_IN_STAGING",
+                ],
+            },
+        },
         'release_channel_mappings': {
             "firefox": [["^.*$", ["beta"]]],
             "devedition": [["^.*$", ["aurora"]]],
         },
         'uptake_monitoring_platforms': {
             "firefox": ("linux", "linux64", "win32", "win64", "macosx64"),
             "fennec": ("android-api-16", "android-x86"),
             "devedition": ("linux", "linux64", "win32", "win64", "macosx64"),