Bug 1508381 - remove now-unnecessary TASKCLUSTER_* variables r=tomprince

Differential Revision: https://phabricator.services.mozilla.com/D18022

--HG--
extra : moz-landing-system : lando

taskcluster/taskgraph/transforms/task.py

@@ -21,7 +21,6 @@ from taskgraph.util.attributes import TRUNK_PROJECTS
 from taskgraph.util.hash import hash_path
 from taskgraph.util.treeherder import split_symbol
 from taskgraph.transforms.base import TransformSequence
-from taskgraph.util.taskcluster import get_root_url
 from taskgraph.util.keyed_by import evaluate_keyed_by
 from taskgraph.util.schema import (
     validate_schema,
@@ -475,11 +474,6 @@ def build_docker_worker_payload(config, task, task_def):
         else:
             raise Exception("unknown docker image type")
 
-    # propagate our TASKCLUSTER_ROOT_URL to the task; note that this will soon
-    # be provided directly by the worker, making this redundant:
-    # https://bugzilla.mozilla.org/show_bug.cgi?id=1460015
-    worker['env']['TASKCLUSTER_ROOT_URL'] = get_root_url()
-
     features = {}
 
     if worker.get('relengapi-proxy'):
@@ -487,7 +481,6 @@ def build_docker_worker_payload(config, task, task_def):
 
     if worker.get('taskcluster-proxy'):
         features['taskclusterProxy'] = True
-        worker['env']['TASKCLUSTER_PROXY_URL'] = 'http://taskcluster/'
 
     if worker.get('allow-ptrace'):
         features['allowPtrace'] = True
@@ -512,11 +505,6 @@ def build_docker_worker_payload(config, task, task_def):
     else:
         worker['env']['SCCACHE_DISABLE'] = '1'
 
-    # this will soon be provided directly by the worker:
-    # https://bugzilla.mozilla.org/show_bug.cgi?id=1460015
-    if features.get('taskclusterProxy'):
-        worker['env']['TASKCLUSTER_PROXY_URL'] = 'http://taskcluster'
-
     capabilities = {}
 
     for lo in 'audio', 'video':
@@ -755,11 +743,6 @@ def build_generic_worker_payload(config, task, task_def):
 
     env = worker.get('env', {})
 
-    # propagate our TASKCLUSTER_ROOT_URL to the task; note that this will soon
-    # be provided directly by the worker, making this redundant:
-    # https://bugzilla.mozilla.org/show_bug.cgi?id=1460015
-    env['TASKCLUSTER_ROOT_URL'] = get_root_url()
-
     if task.get('needs-sccache'):
         env['USE_SCCACHE'] = '1'
         # Disable sccache idle shutdown.
@@ -823,9 +806,6 @@ def build_generic_worker_payload(config, task, task_def):
 
     if worker.get('taskcluster-proxy'):
         features['taskclusterProxy'] = True
-        # this will soon be provided directly by the worker:
-        # https://bugzilla.mozilla.org/show_bug.cgi?id=1460015
-        worker['env']['TASKCLUSTER_PROXY_URL'] = 'http://taskcluster'
 
     if worker.get('run-as-administrator', False):
         features['runAsAdministrator'] = True