Bug 1508381 - remove now-unnecessary TASKCLUSTER_* variables r=tomprince
authorDustin J. Mitchell <dustin@mozilla.com>
Tue, 12 Mar 2019 20:38:25 +0000
changeset 521723 a5d46695e93cdfd60faca65368edd4cf585ccc1d
parent 521722 9f1d74f6f25c0fa6b7fe63f059a89bdd52b4ea81
child 521724 e212dcda9cce85ee547998dbd119cd87625822a3
push id10867
push userdvarga@mozilla.com
push dateThu, 14 Mar 2019 15:20:45 +0000
treeherdermozilla-beta@abad13547875 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerstomprince
bugs1508381
milestone67.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 1508381 - remove now-unnecessary TASKCLUSTER_* variables r=tomprince Differential Revision: https://phabricator.services.mozilla.com/D18022
taskcluster/taskgraph/transforms/task.py
--- a/taskcluster/taskgraph/transforms/task.py
+++ b/taskcluster/taskgraph/transforms/task.py
@@ -16,17 +16,16 @@ import re
 import time
 from copy import deepcopy
 
 from mozbuild.util import memoize
 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,
     Schema,
     optionally_keyed_by,
     resolve_keyed_by,
     OptimizationSchema,
     taskref_or_string,
@@ -470,29 +469,23 @@ def build_docker_worker_payload(config, 
             image = {
                 "path": "public/image.tar.zst",
                 "namespace": image['indexed'],
                 "type": "indexed-image",
             }
         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'):
         features['relengAPIProxy'] = True
 
     if worker.get('taskcluster-proxy'):
         features['taskclusterProxy'] = True
-        worker['env']['TASKCLUSTER_PROXY_URL'] = 'http://taskcluster/'
 
     if worker.get('allow-ptrace'):
         features['allowPtrace'] = True
         task_def['scopes'].append('docker-worker:feature:allowPtrace')
 
     if worker.get('chain-of-trust'):
         features['chainOfTrust'] = True
 
@@ -507,21 +500,16 @@ def build_docker_worker_payload(config, 
                 level=config.params['level'])
         )
         worker['env']['USE_SCCACHE'] = '1'
         # Disable sccache idle shutdown.
         worker['env']['SCCACHE_IDLE_TIMEOUT'] = '0'
     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':
         if worker.get('loopback-' + lo):
             capitalized = 'loopback' + lo.capitalize()
             devices = capabilities.setdefault('devices', {})
             devices[capitalized] = True
             task_def['scopes'].append('docker-worker:capability:device:' + capitalized)
@@ -750,21 +738,16 @@ def build_generic_worker_payload(config,
 
     task_def['payload'] = {
         'command': worker['command'],
         'maxRunTime': worker['max-run-time'],
     }
 
     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.
         env['SCCACHE_IDLE_TIMEOUT'] = '0'
     else:
         env['SCCACHE_DISABLE'] = '1'
 
     if env:
@@ -818,19 +801,16 @@ def build_generic_worker_payload(config,
 
     features = {}
 
     if worker.get('chain-of-trust'):
         features['chainOfTrust'] = True
 
     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
         task_def['scopes'].append(
             'generic-worker:run-as-administrator:{}'.format(task['worker-type']),
         )
 
     if features: