From 47c2e9fede2b1a0b88fc98163683b25f209e7258 Mon Sep 17 00:00:00 2001 From: Johan Lorenzo Date: Fri, 14 Jun 2019 14:17:46 +0200 Subject: [PATCH] Revert "Temp try to run raptor on PRs" This reverts commit 392a063194b966f6699ac9a6909ce7f85fdcaf4b. --- .taskcluster.yml | 9 +-------- automation/taskcluster/lib/tasks.py | 19 +++++++++---------- 2 files changed, 10 insertions(+), 18 deletions(-) diff --git a/.taskcluster.yml b/.taskcluster.yml index 4754d7845..bb1d1a60a 100644 --- a/.taskcluster.yml +++ b/.taskcluster.yml @@ -135,20 +135,13 @@ tasks: - {$eval: 'default_task_definition'} - scopes: - ${assume_scope_prefix}:pull-request - - project:mobile:fenix:releng:signing:cert:dep-signing - - queue:create-task:highest:aws-provisioner-v1/mobile-1-* - - queue:create-task:highest:proj-autophone/gecko-t-bitbar-gw-perf-g5 - - queue:create-task:highest:proj-autophone/gecko-t-bitbar-gw-perf-p2 - - queue:create-task:highest:scriptworker-prov-v1/mobile-signing-dep-v1 - - queue:route:statuses - - queue:route:tc-treeherder.v2.fenix.* payload: command: - >- git fetch ${repository} ${head_branch} && git config advice.detachedHead false && git checkout FETCH_HEAD - && python automation/taskcluster/decision_task.py raptor --staging + && python automation/taskcluster/decision_task.py pull-request env: GITHUB_PULL_TITLE: ${pull_request_title} extra: diff --git a/automation/taskcluster/lib/tasks.py b/automation/taskcluster/lib/tasks.py index 96e2c3ca8..53ab1e844 100644 --- a/automation/taskcluster/lib/tasks.py +++ b/automation/taskcluster/lib/tasks.py @@ -394,16 +394,15 @@ class TaskBuilder(object): self, assemble_task_id, variant, is_staging, ): staging_prefix = '.staging' if is_staging else '' - # routes = [ - # "index.project.mobile.fenix.v2{}.performance-test.{}.{}.{}.latest.{}".format( - # staging_prefix, self.date.year, self.date.month, self.date.day, variant.abi - # ), - # "index.project.mobile.fenix.v2{}.performance-test.{}.{}.{}.revision.{}.{}".format( - # staging_prefix, self.date.year, self.date.month, self.date.day, self.commit, variant.abi - # ), - # "index.project.mobile.fenix.v2{}.performance-test.latest.{}".format(staging_prefix, variant.abi), - # ] - routes = [] + routes = [ + "index.project.mobile.fenix.v2{}.performance-test.{}.{}.{}.latest.{}".format( + staging_prefix, self.date.year, self.date.month, self.date.day, variant.abi + ), + "index.project.mobile.fenix.v2{}.performance-test.{}.{}.{}.revision.{}.{}".format( + staging_prefix, self.date.year, self.date.month, self.date.day, self.commit, variant.abi + ), + "index.project.mobile.fenix.v2{}.performance-test.latest.{}".format(staging_prefix, variant.abi), + ] return self._craft_signing_task( name='sign: {}'.format(variant.raw),