diff --git a/src/taskgraph/transforms/run/run_task.py b/src/taskgraph/transforms/run/run_task.py index 8ca1405c1..26fff3811 100644 --- a/src/taskgraph/transforms/run/run_task.py +++ b/src/taskgraph/transforms/run/run_task.py @@ -28,10 +28,6 @@ run_task_schema = Schema( { Required("using"): "run-task", - # if true, add a cache at ~worker/.cache, which is where things like pip - # tend to hide their caches. This cache is never added for level-1 tasks. - # TODO Once bug 1526028 is fixed, this and 'use-caches' should be merged. - Required("cache-dotcache"): bool, # Which caches to use. Only one of 'include-caches' or 'exclude-caches' # may be specified at a time. If 'include-caches' is specified, it may # take a boolean in which case either all (True) or no (False) caches @@ -119,7 +115,6 @@ def common_setup(config, task, taskdesc, command): worker_defaults = { - "cache-dotcache": False, "checkout": True, "sparse-profile": None, "run-as-root": False, @@ -146,16 +141,6 @@ def docker_worker_run_task(config, task, taskdesc): command = run.pop("run-task-command", ["/usr/local/bin/run-task"]) common_setup(config, task, taskdesc, command) - if run.get("cache-dotcache"): - worker["caches"].append( - { - "type": "persistent", - "name": "{project}-dotcache".format(**config.params), - "mount-point": "{workdir}/.cache".format(**run), - "skip-untrusted": True, - } - ) - run_command = run["command"] # dict is for the case of `{'task-reference': str}`. @@ -188,13 +173,6 @@ def generic_worker_run_task(config, task, taskdesc): common_setup(config, task, taskdesc, command) worker.setdefault("mounts", []) - if run.get("cache-dotcache"): - worker["mounts"].append( - { - "cache-name": "{project}-dotcache".format(**config.params), - "directory": "{workdir}/.cache".format(**run), - } - ) worker["mounts"].append( { "content": { diff --git a/taskcluster/kinds/check/kind.yml b/taskcluster/kinds/check/kind.yml index 9b5651f88..2ee26d16e 100644 --- a/taskcluster/kinds/check/kind.yml +++ b/taskcluster/kinds/check/kind.yml @@ -29,7 +29,6 @@ task-defaults: run: using: run-task cwd: '{checkout}' - cache-dotcache: true tasks: type: diff --git a/taskcluster/kinds/doc/kind.yml b/taskcluster/kinds/doc/kind.yml index 92bf9a274..9d4f5e3c5 100644 --- a/taskcluster/kinds/doc/kind.yml +++ b/taskcluster/kinds/doc/kind.yml @@ -21,7 +21,6 @@ task-defaults: run: using: run-task cwd: '{checkout}' - cache-dotcache: true tasks: generate: diff --git a/taskcluster/kinds/test/kind.yml b/taskcluster/kinds/test/kind.yml index c0206afc7..3447fbbd1 100644 --- a/taskcluster/kinds/test/kind.yml +++ b/taskcluster/kinds/test/kind.yml @@ -34,7 +34,6 @@ task-defaults: run: using: run-task cwd: '{checkout}' - cache-dotcache: true tasks: unit: