Bug 1279221 - Remove buildbot routes for Taskcluster tasks; r?dustin draft
authorMike Shal <mshal@mozilla.com>
Tue, 29 Nov 2016 15:02:00 -0500
changeset 445693 580133cc0d46054eac6b88d1459644c4ca6d4a68
parent 444674 bc4ed3faa33e589fcc1b86221d837b98af3551b7
child 538593 c53bb3406da386f77ee849c0d2863671b2ac4846
push id37588
push userbmo:mshal@mozilla.com
push dateWed, 30 Nov 2016 03:50:01 +0000
reviewersdustin
bugs1279221
milestone53.0a1
Bug 1279221 - Remove buildbot routes for Taskcluster tasks; r?dustin MozReview-Commit-ID: A2YxsnWo9ek
taskcluster/ci/build/android.yml
taskcluster/ci/build/linux.yml
taskcluster/ci/spidermonkey/kind.yml
taskcluster/taskgraph/transforms/task.py
--- a/taskcluster/ci/build/android.yml
+++ b/taskcluster/ci/build/android.yml
@@ -1,14 +1,13 @@
 android-api-15/debug:
     description: "Android 4.0 API15+ Debug"
     index:
         product: mobile
         job-name:
-            buildbot: android-api-15-debug
             gecko-v2: android-api-15-debug
     treeherder:
         platform: android-4-0-armv7-api15/debug
         symbol: tc(B)
     worker-type: aws-provisioner-v1/gecko-{level}-b-android
     worker:
         implementation: docker-worker
         max-run-time: 7200
--- a/taskcluster/ci/build/linux.yml
+++ b/taskcluster/ci/build/linux.yml
@@ -22,17 +22,16 @@ linux64/opt:
         tooltool-downloads: public
         need-xvfb: true
 
 linux64/pgo:
     description: "Linux64 PGO"
     index:
         product: firefox
         job-name:
-            buildbot: linux64-pgo
             gecko-v2: linux64-pgo
     treeherder:
         platform: linux64/pgo
         symbol: tc(B)
         tier: 2
     worker-type: aws-provisioner-v1/gecko-{level}-b-linux
     worker:
         implementation: docker-worker
@@ -50,17 +49,16 @@ linux64/pgo:
         tooltool-downloads: public
         need-xvfb: true
 
 linux64/debug:
     description: "Linux64 Debug"
     index:
         product: firefox
         job-name:
-            buildbot: linux64-debug
             gecko-v2: linux64-debug
     treeherder:
         platform: linux64/debug
         symbol: tc(B)
     worker-type: aws-provisioner-v1/gecko-{level}-b-linux
     worker:
         implementation: docker-worker
         max-run-time: 36000
--- a/taskcluster/ci/spidermonkey/kind.yml
+++ b/taskcluster/ci/spidermonkey/kind.yml
@@ -30,17 +30,16 @@ job-defaults:
             - js/public/**
             - js/src/**
 
 jobs:
     sm-package/opt:
         description: "Spidermonkey source package and test"
         index:
             job-name:
-                buildbot: sm-plain
                 gecko-v2: sm-package-opt
         treeherder:
             symbol: SM-tc(pkg)
         run:
             using: spidermonkey-package
             spidermonkey-variant: plain
         when:
             files-changed:
@@ -82,17 +81,16 @@ jobs:
             - integration
             - release
             - try
 
     sm-plain/debug:
         description: "Spidermonkey Plain"
         index:
             job-name:
-                buildbot: sm-plain
                 gecko-v2: sm-plaindebug-debug
         treeherder:
             platform: linux64/debug
             symbol: SM-tc(p)
         run:
             spidermonkey-variant: plaindebug
 
     sm-plain/opt:
@@ -103,97 +101,89 @@ jobs:
             symbol: SM-tc(p)
         run:
             spidermonkey-variant: plain
 
     sm-arm-sim/debug:
         description: "Spidermonkey ARM sim"
         index:
             job-name:
-                buildbot: sm-plain
                 gecko-v2: sm-arm-sim-debug
         treeherder:
             symbol: SM-tc(arm)
         run:
             spidermonkey-variant: arm-sim
 
     sm-arm64-sim/debug:
         description: "Spidermonkey ARM64 sim"
         index:
             job-name:
-                buildbot: sm-plain
                 gecko-v2: sm-arm64-sim-debug
         treeherder:
             symbol: SM-tc(arm64)
         run:
             spidermonkey-variant: arm64-sim
 
     sm-asan/opt:
         description: "Spidermonkey Address Sanitizer"
         index:
             job-name:
-                buildbot: sm-plain
                 gecko-v2: sm-asan-opt
         treeherder:
             symbol: SM-tc(asan)
         run:
             spidermonkey-variant: asan
             tooltool-manifest: browser/config/tooltool-manifests/linux64/asan.manifest
 
     sm-compacting/debug:
         description: "Spidermonkey Compacting"
         index:
             job-name:
-                buildbot: sm-plain
                 gecko-v2: sm-compacting-debug
         treeherder:
             symbol: SM-tc(cgc)
         run:
             spidermonkey-variant: compacting
 
     sm-msan/opt:
         description: "Spidermonkey Memory Sanitizer"
         index:
             job-name:
-                buildbot: sm-plain
                 gecko-v2: sm-msan-opt
         treeherder:
             symbol: SM-tc(msan)
         run:
             spidermonkey-variant: msan
             tooltool-manifest: browser/config/tooltool-manifests/linux64/msan.manifest
 
     sm-tsan/opt:
         description: "Spidermonkey Thread Sanitizer"
         index:
             job-name:
-                buildbot: sm-plain
                 gecko-v2: sm-tsan-opt
         treeherder:
             symbol: SM-tc(tsan)
             tier: 3
         run-on-projects: []
         run:
             spidermonkey-variant: tsan
             tooltool-manifest: browser/config/tooltool-manifests/linux64/tsan.manifest
 
     sm-rootanalysis/debug:
         description: "Spidermonkey Root Analysis"
         index:
             job-name:
-                buildbot: sm-plain
                 gecko-v2: sm-rootanalysis-debug
         treeherder:
             symbol: SM-tc(r)
         run:
             spidermonkey-variant: rootanalysis
 
     sm-nonunified/debug:
         description: "Spidermonkey Non-Unified Debug"
         index:
             job-name:
-                buildbot: sm-plain
                 gecko-v2: sm-nonunified-debug
         treeherder:
             platform: linux64/debug
             symbol: SM-tc(nu)
         run:
             spidermonkey-variant: nonunified
--- a/taskcluster/taskgraph/transforms/task.py
+++ b/taskcluster/taskgraph/transforms/task.py
@@ -85,26 +85,23 @@ task_description_schema = Schema({
     # information for indexing this build so its artifacts can be discovered;
     # if omitted, the build will not be indexed.
     Optional('index'): {
         # the name of the product this build produces
         'product': Any('firefox', 'mobile'),
 
         # the names to use for this job in the TaskCluster index
         'job-name': Any(
-            # Assuming the job is named "normally", this is the v2 job name,
-            # and the v1 and buildbot routes will be determined appropriately.
+            # Assuming the job is named "normally", this is the v2 job name.
             basestring,
 
             # otherwise, give separate names for each of the legacy index
             # routes; if a name is omitted, no corresponding route will be
             # created.
             {
-                # the name as it appears in buildbot routes
-                Optional('buildbot'): basestring,
                 Required('gecko-v2'): basestring,
             }
         ),
 
         # The rank that the task will receive in the TaskCluster
         # index.  A newly completed task supercedes the currently
         # indexed task iff it has a higher rank.  If unspecified,
         # 'by-tier' behavior will be used.
@@ -309,21 +306,16 @@ GROUP_NAMES = {
     'tc-X-e10s': 'Xpcshell tests executed by TaskCluster with e10s',
     'Aries': 'Aries Device Image',
     'Nexus 5-L': 'Nexus 5-L Device Image',
     'Cc': 'Toolchain builds',
     'SM-tc': 'Spidermonkey builds',
 }
 UNKNOWN_GROUP_NAME = "Treeherder group {} has no name; add it to " + __file__
 
-BUILDBOT_ROUTE_TEMPLATES = [
-    "index.buildbot.branches.{project}.{job-name-buildbot}",
-    "index.buildbot.revisions.{head_rev}.{project}.{job-name-buildbot}",
-]
-
 V2_ROUTE_TEMPLATES = [
     "index.gecko.v2.{project}.latest.{product}.{job-name-gecko-v2}",
     "index.gecko.v2.{project}.pushdate.{build_date_long}.{product}.{job-name-gecko-v2}",
     "index.gecko.v2.{project}.revision.{head_rev}.{product}.{job-name-gecko-v2}",
 ]
 
 # the roots of the treeherder routes, keyed by treeherder environment
 TREEHERDER_ROUTE_ROOTS = {
@@ -516,37 +508,33 @@ def add_index_routes(config, tasks):
         index = task.get('index')
         routes = task.setdefault('routes', [])
 
         if not index:
             yield task
             continue
 
         job_name = index['job-name']
-        # unpack the v2 name to v1 and buildbot names
+        # unpack the v2 name
         if isinstance(job_name, basestring):
             base_name, type_name = job_name.rsplit('-', 1)
             job_name = {
-                'buildbot': base_name,
                 'gecko-v2': '{}-{}'.format(base_name, type_name),
             }
 
         if job_name['gecko-v2'] not in JOB_NAME_WHITELIST:
             raise Exception(JOB_NAME_WHITELIST_ERROR.format(job_name['gecko-v2']))
 
         subs = config.params.copy()
         for n in job_name:
             subs['job-name-' + n] = job_name[n]
         subs['build_date_long'] = time.strftime("%Y.%m.%d.%Y%m%d%H%M%S",
                                                 time.gmtime(config.params['build_date']))
         subs['product'] = index['product']
 
-        if 'buildbot' in job_name:
-            for tpl in BUILDBOT_ROUTE_TEMPLATES:
-                routes.append(tpl.format(**subs))
         if 'gecko-v2' in job_name:
             for tpl in V2_ROUTE_TEMPLATES:
                 routes.append(tpl.format(**subs))
 
         # The default behavior is to rank tasks according to their tier
         extra_index = task.setdefault('extra', {}).setdefault('index', {})
         rank = index.get('rank', 'by-tier')