Bug 1356952 - Use environment variable to define tooltool manifest in hazard builds. r=mshal

Hazard jobs use a specific tooltool-manifest field in their definition.
Since there is no post-processing happening on those definitions, and
since generalizing it would require adding the field to a bunch of
validation schemas, and the same code to various transforms, it's just
simpler to move to use environment variable definitions here too.

Eventually, tooltool manifests won't be necessary anyways, and those
environment variables will go away.

--HG--
extra : rebase_source : bd619024bde051424a2d811a1996caaf0f853247

taskcluster/ci/hazard/kind.yml

@@ -27,9 +27,11 @@ jobs:
         treeherder:
             platform: linux64/debug
             symbol: SM-tc(H)
+        worker:
+            env:
+                TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/linux64/hazard.manifest"
         run:
             using: hazard
-            tooltool-manifest: "browser/config/tooltool-manifests/linux64/hazard.manifest"
             command: >
                 cd /home/worker/checkouts/gecko/taskcluster/scripts/builder
                 && ./build-haz-linux.sh --project shell $HOME/workspace
@@ -46,9 +48,11 @@ jobs:
         treeherder:
             platform: linux64/debug
             symbol: tc(H)
+        worker:
+            env:
+                TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/linux64/hazard.manifest"
         run:
             using: hazard
-            tooltool-manifest: "browser/config/tooltool-manifests/linux64/hazard.manifest"
             mozconfig: "browser/config/mozconfigs/linux64/hazards"
             command: >
                 cd /home/worker/checkouts/gecko/taskcluster/scripts/builder

taskcluster/scripts/builder/build-haz-linux.sh

@@ -37,7 +37,6 @@ PATH=$DIRNAME:$PATH
 export AUTOMATION=${GECKO_BASE_REPOSITORY:+1}
 
 : ${GECKO_DIR:=$WORKSPACE/gecko}
-: ${TOOLTOOL_MANIFEST:=browser/config/tooltool-manifests/linux64/hazard.manifest}
 : ${TOOLTOOL_CACHE:=$WORKSPACE/tt-cache}
 
 if ! [ -d $GECKO_DIR ]; then

taskcluster/taskgraph/transforms/job/hazard.py

@@ -24,9 +24,6 @@ haz_run_schema = Schema({
     # The command to run within the task image (passed through to the worker)
     Required('command'): basestring,
 
-    # The tooltool manifest to use; default in the script is used if omitted
-    Optional('tooltool-manifest'): basestring,
-
     # The mozconfig to use; default in the script is used if omitted
     Optional('mozconfig'): basestring,
 
@@ -59,8 +56,6 @@ def docker_worker_hazard(config, job, taskdesc):
     })
 
     # script parameters
-    if run.get('tooltool-manifest'):
-        env['TOOLTOOL_MANIFEST'] = run['tooltool-manifest']
     if run.get('mozconfig'):
         env['MOZCONFIG'] = run['mozconfig']