Bug 1469095 - Fix always-optimized jobs after bug 1465181. r=dustin draft
authorMike Hommey <mh+mozilla@glandium.org>
Sat, 16 Jun 2018 10:15:50 +0900
changeset 808823 d6bd0c87cef48f9183680e9f504050295394ff1b
parent 808580 e429320fcdd2d5236bb4713e6c435456146e42b9
push id113507
push userbmo:mh+mozilla@glandium.org
push dateWed, 20 Jun 2018 21:18:18 +0000
reviewersdustin
bugs1469095, 1465181
milestone62.0a1
Bug 1469095 - Fix always-optimized jobs after bug 1465181. r=dustin
taskcluster/taskgraph/transforms/job/__init__.py
--- a/taskcluster/taskgraph/transforms/job/__init__.py
+++ b/taskcluster/taskgraph/transforms/job/__init__.py
@@ -147,17 +147,19 @@ def make_task_description(config, jobs):
         if impl:
             job.setdefault('tags', {})['worker-implementation'] = impl
         worker = job.setdefault('worker', {})
         assert 'implementation' not in worker
         worker['implementation'] = impl
         if os:
             worker['os'] = os
 
-        job['run'].setdefault('workdir', '/builds/worker')
+        # always-optimized tasks never execute, so have no workdir
+        if job['run']['using'] != 'always-optimized':
+            job['run'].setdefault('workdir', '/builds/worker')
 
         taskdesc = copy.deepcopy(job)
 
         # fill in some empty defaults to make run implementations easier
         taskdesc.setdefault('attributes', {})
         taskdesc.setdefault('dependencies', {})
         taskdesc.setdefault('routes', [])
         taskdesc.setdefault('scopes', [])