Bug 692501 - run update verify against beta-cdntest for betas r=jlund
authorRail Aliiev <rail@mozilla.com>
Fri, 25 Nov 2016 12:59:39 -0500
changeset 7160 409f510a288e
parent 7159 24348de4fafa
child 7161 ade18d58d693
push id5336
push userraliiev@mozilla.com
push date2016-11-25 18:08 +0000
reviewersjlund
bugs692501
Bug 692501 - run update verify against beta-cdntest for betas r=jlund
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
@@ -445,16 +445,18 @@ def main(options):
                 "push_to_releases_enabled": push_to_releases_enabled,
                 "push_to_releases_automatic": branchConfig['push_to_releases_automatic'],
                 "beetmover_candidates_bucket": branchConfig["beetmover_buckets"][release["product"]],
                 "partner_repacks_platforms": branchConfig.get("partner_repacks_platforms", []),
                 "l10n_changesets": release['l10n_changesets'],
                 "extra_balrog_submitter_params": extra_balrog_submitter_params,
                 "publish_to_balrog_channels": publish_to_balrog_channels,
                 "snap_enabled": branchConfig.get("snap_enabled", False),
+                "update_verify_channel": branchConfig.get("update_verify_channel"),
+                "update_verify_requires_cdn_push": branchConfig.get("update_verify_requires_cdn_push", False),
             }
 
             validate_graph_kwargs(queue, gpg_key_path, **kwargs)
             graph = make_task_graph_strict_kwargs(**kwargs)
             rr.update_status(release, "Submitting task graph")
             log.info("Task graph generated!")
             import pprint
             log.debug(pprint.pformat(graph, indent=4, width=160))
--- a/buildfarm/release/releasetasks_graph_gen.py
+++ b/buildfarm/release/releasetasks_graph_gen.py
@@ -100,16 +100,18 @@ def main(release_runner_config, release_
             revision=release_config["mozilla_revision"],
             platforms=release_config['platforms']
         ),
         "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"],
     }
 
     graph = make_task_graph_strict_kwargs(**kwargs)
     log.info("Submitting task graph")
     import pprint
     log.info(pprint.pformat(graph, indent=4, width=160))
     if not options.dry_run:
         print scheduler.createTaskGraph(graph_id, graph)
--- a/lib/python/kickoff/__init__.py
+++ b/lib/python/kickoff/__init__.py
@@ -241,17 +241,17 @@ def make_task_graph_strict_kwargs(appVer
                                   postrelease_bouncer_aliases_enabled, uptake_monitoring_enabled,
                                   postrelease_version_bump_enabled,
                                   postrelease_mark_as_shipped_enabled,
                                   product, public_key, 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):
+                                  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(
         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,
@@ -291,16 +291,18 @@ def make_task_graph_strict_kwargs(appVer
         tuxedo_server_url=tuxedo_server_url,
         update_verify_enabled=update_verify_enabled,
         updates_builder_enabled=updates_builder_enabled,
         updates_enabled=updates_enabled,
         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,
     )
     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)