Bug 1366075 - Devedition funsize jobs should use "firefox" prefix in "to_mar" r=rail
authorJohan Lorenzo <jlorenzo@mozilla.com>
Mon, 22 May 2017 10:53:56 +0200
changeset 7542 6615ff0a8876
parent 7541 d9503520e097
child 7543 539aad7e9f25
push id5610
push userjlorenzo@mozilla.com
push dateTue, 23 May 2017 16:46:47 +0000
reviewersrail
bugs1366075
Bug 1366075 - Devedition funsize jobs should use "firefox" prefix in "to_mar" r=rail MozReview-Commit-ID: IYCz9HWwjo4
buildfarm/release/release-runner.py
buildfarm/release/releasetasks_graph_gen.py
lib/python/kickoff/__init__.py
--- a/buildfarm/release/release-runner.py
+++ b/buildfarm/release/release-runner.py
@@ -19,17 +19,17 @@ from taskcluster import Scheduler, Index
 from taskcluster.utils import slugId
 import yaml
 
 site.addsitedir(path.join(path.dirname(__file__), "../../lib/python"))
 
 from kickoff import (get_partials, ReleaseRunner,
                      make_task_graph_strict_kwargs, long_revision,
                      get_l10n_config, get_en_US_config, email_release_drivers,
-                     bump_version)
+                     bump_version, get_funsize_product)
 from kickoff.sanity.base import SanityException, is_candidate_release
 from kickoff.sanity.revisions import RevisionsSanitizer
 from kickoff.sanity.l10n import L10nSanitizer
 from kickoff.sanity.partials import PartialsSanitizer
 from kickoff.build_status import are_en_us_builds_completed
 from release.info import readBranchConfig
 from release.l10n import parsePlainL10nChangesets
 from release.versions import getAppVersion
@@ -435,16 +435,17 @@ def main(options):
                 "next_version": bump_version(release["version"].replace("esr", "")),
                 "appVersion": getAppVersion(release["version"]),
                 "buildNumber": release["buildNumber"],
                 "source_enabled": True,
                 "checksums_enabled": True,
                 "repo_path": release["branch"],
                 "revision": release["mozillaRevision"],
                 "product": release["product"],
+                "funsize_product": get_funsize_product(release["product"]),
                 # if mozharness_revision is not passed, use 'revision'
                 "mozharness_changeset": release.get('mh_changeset') or release['mozillaRevision'],
                 "partial_updates": release.get('partial_updates', list()),
                 "branch": release['branchShortName'],
                 "updates_enabled": bool(release["partials"]),
                 "l10n_config": get_l10n_config(
                     index=index, product=release[
                         "product"], branch=release['branchShortName'],
--- a/buildfarm/release/releasetasks_graph_gen.py
+++ b/buildfarm/release/releasetasks_graph_gen.py
@@ -71,16 +71,17 @@ def main(release_runner_config, release_
         "postrelease_version_bump_enabled": release_config['postrelease_version_bump_enabled'],
         "push_to_releases_automatic": release_config['push_to_releases_automatic'],
         "partner_repacks_platforms": release_config["partner_repacks_platforms"],
         "eme_free_repacks_platforms": release_config["eme_free_repacks_platforms"],
         "sha1_repacks_platforms": release_config["sha1_repacks_platforms"],
         "repo_path": release_config["repo_path"],
         "branch": release_config["branch"],
         "product": release_config["product"],
+        "funsize_product": release_config["funsize_product"],
         "release_channels": release_config['channels'],
         "final_verify_channels": release_config['final_verify_channels'],
         "final_verify_platforms": release_config['final_verify_platforms'],
         "uptake_monitoring_platforms": release_config['uptake_monitoring_platforms'],
         "source_enabled": release_config["source_enabled"],
         "checksums_enabled": release_config["checksums_enabled"],
         "updates_enabled": release_config["updates_enabled"],
         "push_to_releases_enabled": release_config["push_to_releases_enabled"],
--- a/lib/python/kickoff/__init__.py
+++ b/lib/python/kickoff/__init__.py
@@ -243,18 +243,18 @@ def make_task_graph_strict_kwargs(appVer
                                   extra_balrog_submitter_params, final_verify_channels,
                                   final_verify_platforms, uptake_monitoring_platforms,
                                   funsize_balrog_api_root, l10n_config, signing_cert,
                                   l10n_changesets, mozharness_changeset, next_version,
                                   partial_updates, partner_repacks_platforms,
                                   eme_free_repacks_platforms, sha1_repacks_platforms,
                                   postrelease_bouncer_aliases_enabled, uptake_monitoring_enabled,
                                   postrelease_version_bump_enabled, moz_disable_mar_cert_verification,
-                                  postrelease_mark_as_shipped_enabled, accepted_mar_channel_id,
-                                  product, public_key, stage_product, push_to_candidates_enabled,
+                                  postrelease_mark_as_shipped_enabled, accepted_mar_channel_id, public_key,
+                                  product, stage_product, funsize_product, push_to_candidates_enabled,
                                   push_to_releases_automatic, push_to_releases_enabled, release_channels,
                                   repo_path, revision, signing_class, signing_pvt_key, source_enabled,
                                   tuxedo_server_url, update_verify_enabled, updates_builder_enabled,
                                   updates_enabled, verifyConfigs, version, publish_to_balrog_channels,
                                   snap_enabled, update_verify_channel, update_verify_requires_cdn_push):
     """simple wrapper that sanitizes whatever calls make_task_graph uses universally known kwargs"""
 
     kwargs = dict(
@@ -317,8 +317,14 @@ def make_task_graph_strict_kwargs(appVer
     )
     if extra_balrog_submitter_params:
         kwargs["extra_balrog_submitter_params"] = extra_balrog_submitter_params
 
     # don't import releasetasks until required within function impl to avoid global failures
     # during nosetests
     from releasetasks import make_task_graph
     return make_task_graph(**kwargs)
+
+
+def get_funsize_product(product_name):
+    if product_name == 'devedition':    # See bug 1366075
+        return 'firefox'
+    return product_name