From 916bad784eeef6a9aabc9fda22425a426f182a9b Mon Sep 17 00:00:00 2001 From: Wes Kocher Date: Thu, 20 Jul 2017 17:59:20 -0700 Subject: [PATCH] Backed out changeset 0ee08a9803fc (bug 1382849) for cctools bustage a=backout MozReview-Commit-ID: 61JTxrzOYOZ --- taskcluster/ci/toolchain/kind.yml | 1 - taskcluster/taskgraph/transforms/build_attrs.py | 6 +----- taskcluster/taskgraph/transforms/job/toolchain.py | 2 -- 3 files changed, 1 insertion(+), 8 deletions(-) diff --git a/taskcluster/ci/toolchain/kind.yml b/taskcluster/ci/toolchain/kind.yml index 143f22aec35b..23f5290fb6fe 100644 --- a/taskcluster/ci/toolchain/kind.yml +++ b/taskcluster/ci/toolchain/kind.yml @@ -6,7 +6,6 @@ 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 diff --git a/taskcluster/taskgraph/transforms/build_attrs.py b/taskcluster/taskgraph/transforms/build_attrs.py index 4781231f259f..56c0076148b0 100644 --- a/taskcluster/taskgraph/transforms/build_attrs.py +++ b/taskcluster/taskgraph/transforms/build_attrs.py @@ -17,11 +17,7 @@ def set_build_attributes(config, jobs): 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': diff --git a/taskcluster/taskgraph/transforms/job/toolchain.py b/taskcluster/taskgraph/transforms/job/toolchain.py index 1bdfaff8d29d..bc48c29ca223 100644 --- a/taskcluster/taskgraph/transforms/job/toolchain.py +++ b/taskcluster/taskgraph/transforms/job/toolchain.py @@ -14,7 +14,6 @@ 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 @@ -87,7 +86,6 @@ def docker_worker_toolchain(config, job, taskdesc): '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)