Bug 1465799 - Makes sure that we don't check for a truthy stub-installer value until after resolving keyed by r=dustin
authorJustin Wood <Callek@gmail.com>
Fri, 15 Jun 2018 11:52:54 -0700
changeset 423067 778e2a00786e5602f331349987622ab999271b22
parent 423066 c9bad496f81b6a56078d01836bca5a902a68aeb5
child 423068 36b51dda5abe7186282785df8e1501c27a16ea31
push id65342
push userapavel@mozilla.com
push dateWed, 20 Jun 2018 11:30:38 +0000
treeherderautoland@dadc58a65c2e [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersdustin
bugs1465799
milestone62.0a1
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
Bug 1465799 - Makes sure that we don't check for a truthy stub-installer value until after resolving keyed by r=dustin Fixes https://bugzilla.mozilla.org/show_bug.cgi?id=1465799#c11 Differential Revision: https://phabricator.services.mozilla.com/D1671
taskcluster/taskgraph/transforms/build.py
--- a/taskcluster/taskgraph/transforms/build.py
+++ b/taskcluster/taskgraph/transforms/build.py
@@ -31,24 +31,25 @@ def set_defaults(config, jobs):
             worker['chain-of-trust'] = True
 
         yield job
 
 
 @transforms.add
 def stub_installer(config, jobs):
     for job in jobs:
+        resolve_keyed_by(
+            job, 'stub-installer', item_name=job['name'], project=config.params['project']
+        )
         job.setdefault('attributes', {})
         if job.get('stub-installer'):
-            resolve_keyed_by(
-                job, 'stub-installer', item_name=job['name'], project=config.params['project']
-            )
             job['attributes']['stub-installer'] = job['stub-installer']
+            job['worker']['env'].update({"USE_STUB_INSTALLER": "1"})
+        if 'stub-installer' in job:
             del job['stub-installer']
-            job['worker']['env'].update({"USE_STUB_INSTALLER": "1"})
         yield job
 
 
 @transforms.add
 def set_env(config, jobs):
     """Set extra environment variables from try command line."""
     env = []
     if config.params['try_mode'] == 'try_option_syntax':