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 566080 dd4b06c1b9820df54646f17acf76719e20eef33c
parent 566079 8f4c7949e850d2321f15ec152f9d9774d1a11ea8
child 566081 e8b7c48d4e7ed1b63aeedff379b51e566ea499d9
push id2218
push userffxbld-merge
push dateMon, 30 Dec 2019 12:35:14 +0000
treeherdermozilla-release@a6145f140c2c [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersCallek, me
bugs1589706
milestone72.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 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'),
@@ -87,18 +86,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']