Bug 1631839 - part 1: Expose new routes without `project.` (#10092)
parent
26e8d9bcca
commit
9e89a17591
|
@ -168,11 +168,18 @@ tasks:
|
||||||
# staging release promotion on forks.
|
# staging release promotion on forks.
|
||||||
- $if: 'tasks_for == "github-push"'
|
- $if: 'tasks_for == "github-push"'
|
||||||
then:
|
then:
|
||||||
|
- index.mobile.v2.${project}.branch.${short_head_branch}.latest.taskgraph.decision
|
||||||
|
- index.mobile.v2.${project}.branch.${short_head_branch}.revision.${head_sha}.taskgraph.decision
|
||||||
|
# TODO Bug 1631839: Remove the following routes once all consumers have migrated
|
||||||
- index.project.mobile.${project}.v2.branch.${short_head_branch}.latest.taskgraph.decision
|
- index.project.mobile.${project}.v2.branch.${short_head_branch}.latest.taskgraph.decision
|
||||||
- index.project.mobile.${project}.v2.branch.${short_head_branch}.revision.${head_sha}.taskgraph.decision
|
- index.project.mobile.${project}.v2.branch.${short_head_branch}.revision.${head_sha}.taskgraph.decision
|
||||||
- $if: 'tasks_for == "cron"'
|
- $if: 'tasks_for == "cron"'
|
||||||
then:
|
then:
|
||||||
# cron context provides ${head_branch} as a short one
|
# cron context provides ${head_branch} as a short one
|
||||||
|
- index.mobile.v2.${project}.branch.${head_branch}.latest.taskgraph.decision-${cron.job_name}
|
||||||
|
- index.mobile.v2.${project}.branch.${head_branch}.revision.${head_sha}.taskgraph.decision-${cron.job_name}
|
||||||
|
- index.mobile.v2.${project}.branch.${head_branch}.revision.${head_sha}.taskgraph.cron.${ownTaskId}
|
||||||
|
# TODO Bug 1631839: Remove the following routes once all consumers have migrated
|
||||||
- index.project.mobile.${project}.v2.branch.${head_branch}.latest.taskgraph.decision-${cron.job_name}
|
- index.project.mobile.${project}.v2.branch.${head_branch}.latest.taskgraph.decision-${cron.job_name}
|
||||||
- index.project.mobile.${project}.v2.branch.${head_branch}.revision.${head_sha}.taskgraph.decision-${cron.job_name}
|
- index.project.mobile.${project}.v2.branch.${head_branch}.revision.${head_sha}.taskgraph.decision-${cron.job_name}
|
||||||
- index.project.mobile.${project}.v2.branch.${head_branch}.revision.${head_sha}.taskgraph.cron.${ownTaskId}
|
- index.project.mobile.${project}.v2.branch.${head_branch}.revision.${head_sha}.taskgraph.cron.${ownTaskId}
|
||||||
|
|
|
@ -25,7 +25,7 @@ taskgraph:
|
||||||
repositories:
|
repositories:
|
||||||
mobile:
|
mobile:
|
||||||
name: "Fenix"
|
name: "Fenix"
|
||||||
cached-task-prefix: project.mobile.fenix
|
cached-task-prefix: mobile.v2.fenix
|
||||||
decision-parameters: 'fenix_taskgraph.parameters:get_decision_parameters'
|
decision-parameters: 'fenix_taskgraph.parameters:get_decision_parameters'
|
||||||
|
|
||||||
workers:
|
workers:
|
||||||
|
|
|
@ -12,6 +12,12 @@ from taskgraph.transforms.task import index_builder
|
||||||
# In the future, notifying consumers may be easier (https://bugzilla.mozilla.org/show_bug.cgi?id=1548810), but
|
# In the future, notifying consumers may be easier (https://bugzilla.mozilla.org/show_bug.cgi?id=1548810), but
|
||||||
# we need to remember to tell users for the time being
|
# we need to remember to tell users for the time being
|
||||||
SIGNING_ROUTE_TEMPLATES = [
|
SIGNING_ROUTE_TEMPLATES = [
|
||||||
|
"index.{trust-domain}.v2.{project}.{variant}.latest.{abi}",
|
||||||
|
"index.{trust-domain}.v2.{project}.{variant}.{build_date}.revision.{head_rev}.{abi}",
|
||||||
|
"index.{trust-domain}.v2.{project}.{variant}.{build_date}.latest.{abi}",
|
||||||
|
"index.{trust-domain}.v2.{project}.{variant}.revision.{head_rev}.{abi}",
|
||||||
|
|
||||||
|
# TODO Bug 1631839: Remove the following scopes once all consumers have migrated
|
||||||
"index.project.{trust-domain}.{project}.v2.{variant}.{build_date}.revision.{head_rev}",
|
"index.project.{trust-domain}.{project}.v2.{variant}.{build_date}.revision.{head_rev}",
|
||||||
"index.project.{trust-domain}.{project}.v2.{variant}.{build_date}.latest",
|
"index.project.{trust-domain}.{project}.v2.{variant}.{build_date}.latest",
|
||||||
"index.project.{trust-domain}.{project}.v2.{variant}.latest",
|
"index.project.{trust-domain}.{project}.v2.{variant}.latest",
|
||||||
|
@ -20,8 +26,6 @@ SIGNING_ROUTE_TEMPLATES = [
|
||||||
|
|
||||||
@index_builder("signing")
|
@index_builder("signing")
|
||||||
def add_signing_indexes(config, task):
|
def add_signing_indexes(config, task):
|
||||||
routes = task.setdefault("routes", [])
|
|
||||||
|
|
||||||
if config.params["level"] != "3":
|
if config.params["level"] != "3":
|
||||||
return task
|
return task
|
||||||
|
|
||||||
|
@ -32,6 +36,11 @@ def add_signing_indexes(config, task):
|
||||||
subs["trust-domain"] = config.graph_config["trust-domain"]
|
subs["trust-domain"] = config.graph_config["trust-domain"]
|
||||||
subs["variant"] = task["attributes"]["build-type"]
|
subs["variant"] = task["attributes"]["build-type"]
|
||||||
|
|
||||||
|
unique_routes = set()
|
||||||
for tpl in SIGNING_ROUTE_TEMPLATES:
|
for tpl in SIGNING_ROUTE_TEMPLATES:
|
||||||
routes.append(tpl.format(**subs))
|
for abi in task["attributes"]["apks"].keys():
|
||||||
|
subs["abi"] = abi
|
||||||
|
unique_routes.add(tpl.format(**subs))
|
||||||
|
|
||||||
|
task.setdefault("routes", sorted(list(unique_routes)))
|
||||||
return task
|
return task
|
||||||
|
|
Loading…
Reference in New Issue