diff --git a/.taskcluster.yml b/.taskcluster.yml index d349fa519..b175ab5da 100644 --- a/.taskcluster.yml +++ b/.taskcluster.yml @@ -174,19 +174,12 @@ tasks: - index.mobile.v2.${project}.branch.${short_head_branch}.latest.taskgraph.decision - index.mobile.v2.${project}.branch.${short_head_branch}.revision.${head_sha}.taskgraph.decision - index.mobile.v2.${project}.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}.revision.${head_sha}.taskgraph.decision - $if: 'tasks_for == "cron"' then: # 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}.revision.${head_sha}.taskgraph.decision-${cron.job_name} - - index.project.mobile.${project}.v2.branch.${head_branch}.revision.${head_sha}.taskgraph.cron.${ownTaskId} scopes: $if: 'tasks_for == "github-push"' then: diff --git a/taskcluster/fenix_taskgraph/routes.py b/taskcluster/fenix_taskgraph/routes.py index 6f7d03beb..32892295e 100644 --- a/taskcluster/fenix_taskgraph/routes.py +++ b/taskcluster/fenix_taskgraph/routes.py @@ -16,11 +16,6 @@ SIGNING_ROUTE_TEMPLATES = [ "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}.latest", - "index.project.{trust-domain}.{project}.v2.{variant}.latest", ]