Bug 1589706: [firefox-ci] Remove some obsolete code related to old staging clusters; r=Callek a=tomprince
authorTom Prince <mozilla@hocat.ca>
Fri, 08 Nov 2019 17:44:10 -0700
changeset 559958 803bfbf03582e5e48af743094d51afd31c44957d
parent 559957 d0861fc55bcca7cff4f84535c78854bf1a4e48c0
child 559959 6e421f272d554fb85d0008899457915c59865ef6
push id12281
push usermozilla@hocat.ca
push dateSat, 09 Nov 2019 00:44:34 +0000
treeherdermozilla-beta@803bfbf03582 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersCallek, tomprince
Bug 1589706: [firefox-ci] Remove some obsolete code related to old staging clusters; r=Callek a=tomprince 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
--- 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
     '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'),
@@ -87,18 +86,9 @@ def worker_type_implementation(graph_con
 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']