Bug 1589706: [firefox-ci] Remove some obsolete code related to old staging clusters; r=Callek a=me
authorTom Prince <mozilla@hocat.ca>
Wed, 06 Nov 2019 00:33:16 -0700
changeset 555694 964ff679f60d09e43df069a49f48500d1010e13d
parent 555693 a51f5732fb069604fc66e20f615eb5bf9d9ab147
child 555695 be352972e728639256f0532d8a167798ea205a1c
push id2188
push usermozilla@hocat.ca
push dateSat, 09 Nov 2019 00:47:50 +0000
treeherdermozilla-release@964ff679f60d [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersCallek, me
bugs1589706
milestone70.0.2
Bug 1589706: [firefox-ci] Remove some obsolete code related to old staging clusters; r=Callek a=me We originally had a different plan related to migrating worker-types to a new cluster. Remove the code that supported that. Differential Revision: https://phabricator.services.mozilla.com/D52076
taskcluster/taskgraph/util/workertypes.py
--- a/taskcluster/taskgraph/util/workertypes.py
+++ b/taskcluster/taskgraph/util/workertypes.py
@@ -1,17 +1,16 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 from __future__ import absolute_import, print_function, unicode_literals
 
 from mozbuild.util import memoize
 
-from .taskcluster import get_root_url
 from .keyed_by import evaluate_keyed_by
 from .attributes import keymatch
 
 WORKER_TYPES = {
     'gce/gecko-1-b-linux': ('docker-worker', 'linux'),
     'gce/gecko-2-b-linux': ('docker-worker', 'linux'),
     'gce/gecko-3-b-linux': ('docker-worker', 'linux'),
     'releng-hardware/gecko-1-b-win2012-gamma': ('generic-worker', 'windows'),
@@ -86,18 +85,9 @@ def worker_type_implementation(graph_con
 @memoize
 def get_worker_type(graph_config, worker_type, level):
     """
     Get the worker type provisioner and worker-type, optionally evaluating
     aliases from the graph config.
     """
     worker_config = _get(graph_config, worker_type, level)
 
-    # translate the provisionerId to 'ec2' everywhere but the original
-    # https://taskcluster.net deployment.  Once that deployment is no longer in
-    # use, this can be removed and all corresponding provisioners changed to
-    # `ec2`
-    root_url = get_root_url(False)
-    provisioner = worker_config["provisioner"]
-    if root_url != 'https://taskcluster.net' and provisioner == 'aws-provisioner-v1':
-        provisioner = 'ec2'
-
-    return provisioner, worker_config['worker-type']
+    return worker_config['provisioner'], worker_config['worker-type']