зеркало из https://github.com/mozilla/gecko-dev.git
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 --HG-- extra : rebase_source : 1c0945e96add41659f56013a01d4d246e2d69dd3 extra : histedit_source : 03acebc1cc6796bd60cd472bc3c5c92a9c17f02b
This commit is contained in:
Родитель
bbeda44922
Коммит
7c40fcaaa9
|
@ -6,7 +6,6 @@ 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
|
||||
|
||||
|
@ -92,13 +91,4 @@ def get_worker_type(graph_config, worker_type, level):
|
|||
"""
|
||||
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']
|
||||
|
|
Загрузка…
Ссылка в новой задаче