Backed out changeset 0ee08a9803fc (bug 1382849) for cctools bustage a=backout
authorWes Kocher <wkocher@mozilla.com>
Thu, 20 Jul 2017 17:59:20 -0700
changeset 418797 b1e444b1b4c70411975bd05715408b219a8f2bf0
parent 418796 d4b7fc921b88a8416c656e3ee6a893479b463fc4
child 418798 c316420a58e80111f9bdddfffc2bfb3bcfefd1f1
push id7566
push usermtabara@mozilla.com
push dateWed, 02 Aug 2017 08:25:16 +0000
treeherdermozilla-beta@86913f512c3c [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbackout
bugs1382849
milestone56.0a1
backs out0ee08a9803fc13145128cfa0625a63bd464ccd32
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Backed out changeset 0ee08a9803fc (bug 1382849) for cctools bustage a=backout MozReview-Commit-ID: 61JTxrzOYOZ
taskcluster/ci/toolchain/kind.yml
taskcluster/taskgraph/transforms/build_attrs.py
taskcluster/taskgraph/transforms/job/toolchain.py
--- a/taskcluster/ci/toolchain/kind.yml
+++ b/taskcluster/ci/toolchain/kind.yml
@@ -1,17 +1,16 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 loader: taskgraph.loader.transform:loader
 
 transforms:
    - taskgraph.transforms.try_job:transforms
-   - taskgraph.transforms.build_attrs:transforms
    - taskgraph.transforms.toolchain:transforms
    - taskgraph.transforms.job:transforms
    - taskgraph.transforms.task:transforms
 
 jobs-from:
    - linux.yml
    - macosx.yml
    - windows.yml
--- a/taskcluster/taskgraph/transforms/build_attrs.py
+++ b/taskcluster/taskgraph/transforms/build_attrs.py
@@ -12,21 +12,17 @@ transforms = TransformSequence()
 def set_build_attributes(config, jobs):
     """
     Set the build_platform and build_type attributes based on the job name.
     Although not all jobs using this transform are actual "builds", the try
     option syntax treats them as such, and this arranges the attributes
     appropriately for that purpose.
     """
     for job in jobs:
-        if '/' in job['name']:
-            build_platform, build_type = job['name'].split('/')
-        else:
-            build_platform = job['name']
-            build_type = 'opt'
+        build_platform, build_type = job['name'].split('/')
 
         # pgo builds are represented as a different platform, type opt
         if build_type == 'pgo':
             build_platform = build_platform + '-pgo'
             build_type = 'opt'
 
         attributes = job.setdefault('attributes', {})
         attributes.update({
--- a/taskcluster/taskgraph/transforms/job/toolchain.py
+++ b/taskcluster/taskgraph/transforms/job/toolchain.py
@@ -9,17 +9,16 @@ from __future__ import absolute_import, 
 
 from taskgraph.util.schema import Schema
 from voluptuous import Optional, Required, Any
 
 from taskgraph.transforms.job import run_job_using
 from taskgraph.transforms.job.common import (
     docker_worker_add_tc_vcs_cache,
     docker_worker_add_gecko_vcs_env_vars,
-    docker_worker_add_workspace_cache,
     support_vcs_checkout,
 )
 from taskgraph.util.hash import hash_paths
 from taskgraph import GECKO
 
 
 TOOLCHAIN_INDEX = 'gecko.cache.level-{level}.toolchains.v1.{name}.{digest}'
 
@@ -82,17 +81,16 @@ def docker_worker_toolchain(config, job,
     worker['caches'] = []
 
     worker['artifacts'].append({
         'name': 'public',
         'path': '/home/worker/workspace/artifacts/',
         'type': 'directory',
     })
 
-    docker_worker_add_workspace_cache(config, job, taskdesc)
     docker_worker_add_tc_vcs_cache(config, job, taskdesc)
     docker_worker_add_gecko_vcs_env_vars(config, job, taskdesc)
     support_vcs_checkout(config, job, taskdesc)
 
     env = worker['env']
     env.update({
         'MOZ_BUILD_DATE': config.params['moz_build_date'],
         'MOZ_SCM_LEVEL': config.params['level'],