Bug 1395697 - Generate bz2-compressed completes r=catlee
authorRail Aliiev <rail@mozilla.com>
Sat, 16 Sep 2017 09:50:12 -0400
changeset 7853 6798845e667adbb84270a0ca7a18f6600d2b534b
parent 7852 e7efa4f81256a394cd1f84eee86472c0e966911f
child 7854 d2d56a1edc148dd805743ef04c47c1d85e96e0e3
push id5808
push userraliiev@mozilla.com
push dateSat, 16 Sep 2017 13:50:21 +0000
reviewerscatlee
bugs1395697
Bug 1395697 - Generate bz2-compressed completes r=catlee
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
@@ -517,16 +517,17 @@ def main(options):
                 "eme_free_repacks_platforms": branchConfig.get("eme_free_repacks_platforms", {}).get(release["product"], []),
                 "sha1_repacks_platforms": branchConfig.get("sha1_repacks_platforms", []),
                 "l10n_changesets": release['l10n_changesets'],
                 "extra_balrog_submitter_params": extra_balrog_submitter_params + " --product " + release["product"].capitalize(),
                 "publish_to_balrog_channels": publish_to_balrog_channels,
                 "snap_enabled": branchConfig.get("snap_enabled", {}).get(release["product"], False),
                 "update_verify_channel": branchConfig.get("update_verify_channel", {}).get(release["product"]),
                 "update_verify_requires_cdn_push": branchConfig.get("update_verify_requires_cdn_push", False),
+                "lzma_to_bz2": branchConfig.get("lzma_to_bz2", False),
             }
 
             # TODO: en-US validation for multiple tasks
             # validate_graph_kwargs(queue, gpg_key_path, **kwargs)
             task_group_id, toplevel_task_id, tasks = make_task_graph_strict_kwargs(**kwargs)
             rr.update_status(release, "Submitting tasks")
             log.info("Tasks generated!")
             import pprint
--- a/buildfarm/release/releasetasks_graph_gen.py
+++ b/buildfarm/release/releasetasks_graph_gen.py
@@ -114,16 +114,17 @@ def main(release_runner_config, release_
         "extra_balrog_submitter_params": release_config['extra_balrog_submitter_params'],
         "publish_to_balrog_channels": release_config["publish_to_balrog_channels"],
         "postrelease_mark_as_shipped_enabled": release_config["postrelease_mark_as_shipped_enabled"],
         # TODO: use [] when snaps_enabled is landed
         "snap_enabled": release_config.get("snap_enabled", False),
         "update_verify_channel": release_config["update_verify_channel"],
         "update_verify_requires_cdn_push": release_config["update_verify_requires_cdn_push"],
         "release_eta": release_config.get("release_eta"),
+        "lzma_to_bz2": release_config.get("lzma_to_bz2", False),
     }
 
     task_group_id, toplevel_task_id, tasks = make_task_graph_strict_kwargs(**kwargs)
     log.info('Tasks generated, but not yet submitted to Taskcluster.')
     import pprint
     for task_id, task_def in tasks.items():
         log.debug("%s ->\n%s", task_id,
                   pprint.pformat(task_def, indent=4, width=160))
--- a/lib/python/kickoff/__init__.py
+++ b/lib/python/kickoff/__init__.py
@@ -291,17 +291,17 @@ def make_task_graph_strict_kwargs(appVer
                                   postrelease_version_bump_enabled, moz_disable_mar_cert_verification,
                                   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,
-                                  release_eta):
+                                  release_eta, lzma_to_bz2):
     """simple wrapper that sanitizes whatever calls make_task_graph uses universally known kwargs"""
 
     kwargs = dict(
         appVersion=appVersion,
         balrog_api_root=balrog_api_root,
         balrog_password=balrog_password,
         balrog_username=balrog_username,
         beetmover_aws_access_key_id=beetmover_aws_access_key_id,
@@ -355,16 +355,17 @@ def make_task_graph_strict_kwargs(appVer
         verifyConfigs=verifyConfigs,
         version=version,
         publish_to_balrog_channels=publish_to_balrog_channels,
         snap_enabled=snap_enabled,
         update_verify_channel=update_verify_channel,
         update_verify_requires_cdn_push=update_verify_requires_cdn_push,
         funsize_product=funsize_product,
         release_eta=release_eta,
+        lzma_to_bz2=lzma_to_bz2,
     )
     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_tasks
     return make_tasks(**kwargs)