Bug 1250585 - uses branchConfig for push to releases is automatic, tools repo, r?rail draft
authorJordan Lund <jlund@mozilla.com>
Wed, 24 Feb 2016 09:12:17 -0800
changeset 6574 7e916154e21d743ff59ed07e9513bcb0def92f94
parent 6573 dab133f1ba6ce293d8ded072414d20807c7b9f57
push id23
push userjlund@mozilla.com
push dateWed, 24 Feb 2016 17:12:27 +0000
reviewersrail
bugs1250585
Bug 1250585 - uses branchConfig for push to releases is automatic, tools repo, r?rail MozReview-Commit-ID: 1NrOTScdocD
buildfarm/release/release-runner.py
--- a/buildfarm/release/release-runner.py
+++ b/buildfarm/release/release-runner.py
@@ -149,20 +149,16 @@ def get_platform_locales(l10n_changesets
     if platform == "macosx64":
         ignore = "ja"
     else:
         ignore = "ja-JP-mac"
 
     return [l for l in l10n_changesets.keys() if l != ignore]
 
 
-def is_push_to_releases_automatic(branch):
-    return branch in ('mozilla-beta', 'date')
-
-
 def get_l10n_config(release, branchConfig, branch, l10n_changesets, index):
     l10n_platforms = {}
     for platform in branchConfig["l10n_release_platforms"]:
         task = index.findTask("buildbot.revisions.{revision}.{branch}.{platform}".format(
             revision=release["mozillaRevision"],
             branch=branch,
             platform=platform,
         ))
@@ -321,17 +317,17 @@ def main(options):
                 "signing_class": "dep-signing",
                 "bouncer_enabled": branchConfig["bouncer_enabled"],
                 "release_channels": branchConfig["release_channels"],
                 "signing_pvt_key": signing_pvt_key,
                 "build_tools_repo_path": branchConfig['build_tools_repo_path'],
                 "push_to_candidates_enabled": branchConfig['push_to_candidates_enabled'],
                 "postrelease_version_bump_enabled": branchConfig['postrelease_version_bump_enabled'],
                 "push_to_releases_enabled": True,
-                "push_to_releases_automatic": is_push_to_releases_automatic(branch),
+                "push_to_releases_automatic": branchConfig['push_to_releases_automatic'],
                 "beetmover_candidates_bucket": branchConfig["beetmover_candidates_bucket"],
             }
 
             validate_graph_kwargs(**kwargs)
 
             graph_id = slugId()
             graph = make_task_graph(**kwargs)