Fixes for Swarming recipes

infra/bots/flavor/android_devices.py

Index: infra/bots/flavor/android_devices.py
diff --git a/infra/bots/flavor/android_devices.py b/infra/bots/flavor/android_devices.py
deleted file mode 100644
index 37ceabef3a8128057666d20466c1747d22f9c595..0000000000000000000000000000000000000000
--- a/infra/bots/flavor/android_devices.py
+++ /dev/null
@@ -1,100 +0,0 @@
-#!/usr/bin/env python
-#
-# Copyright 2016 Google Inc.
-#
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-
-import collections
-import json
-
-
-DEFAULT_SDK_ROOT = '/home/chrome-bot/android-sdk-linux'
-MAC_SDK_ROOT = '/Users/chrome-bot/adt-bundle-mac-x86_64-20140702/sdk'
-MACMINI_SDK_ROOT = '/Users/chrome-bot/android-sdk-macosx'
-
-SlaveInfo = collections.namedtuple('SlaveInfo',
-                                   'serial android_sdk_root has_root')
-
-SLAVE_INFO = {
-  'skiabot-mac-10_8-compile-000':
-      SlaveInfo('noserial', MAC_SDK_ROOT, True),
-  'skiabot-mac-10_8-compile-001':
-      SlaveInfo('noserial', MAC_SDK_ROOT, True),
-  'skiabot-mac-10_8-compile-002':
-      SlaveInfo('noserial', MAC_SDK_ROOT, True),
-  'skiabot-mac-10_8-compile-003':
-      SlaveInfo('noserial', MAC_SDK_ROOT, True),
-  'skiabot-mac-10_8-compile-004':
-      SlaveInfo('noserial', MAC_SDK_ROOT, True),
-  'skiabot-mac-10_8-compile-005':
-      SlaveInfo('noserial', MAC_SDK_ROOT, True),
-  'skiabot-mac-10_8-compile-006':
-      SlaveInfo('noserial', MAC_SDK_ROOT, True),
-  'skiabot-mac-10_8-compile-007':
-      SlaveInfo('noserial', MAC_SDK_ROOT, True),
-  'skiabot-mac-10_8-compile-008':
-      SlaveInfo('noserial', MAC_SDK_ROOT, True),
-  'skiabot-mac-10_8-compile-009':
-      SlaveInfo('noserial', MAC_SDK_ROOT, True),
-  'skiabot-shuttle-ubuntu15-androidone-001':
-      SlaveInfo('AG86044202A04GC', DEFAULT_SDK_ROOT, True),
-  'skiabot-shuttle-ubuntu15-androidone-002':
-      SlaveInfo('AG8404EC06G02GC', DEFAULT_SDK_ROOT, True),
-  'skiabot-shuttle-ubuntu15-androidone-003':
-      SlaveInfo('AG8404EC0688EGC', DEFAULT_SDK_ROOT, True),
-  'skiabot-shuttle-ubuntu12-galaxys3-001':
-      SlaveInfo('4df713b8244a21cf', DEFAULT_SDK_ROOT, False),
-  'skiabot-shuttle-ubuntu12-galaxys3-002':
-      SlaveInfo('32309a56e9b3a09f', DEFAULT_SDK_ROOT, False),
-  'skiabot-shuttle-ubuntu12-galaxys4-001':
-      SlaveInfo('4d0032a5d8cb6125', MACMINI_SDK_ROOT, False),
-  'skiabot-shuttle-ubuntu12-galaxys4-002':
-      SlaveInfo('4d00353cd8ed61c3', MACMINI_SDK_ROOT, False),
-  'skiabot-shuttle-ubuntu12-nexus5-001':
-      SlaveInfo('03f61449437cc47b', DEFAULT_SDK_ROOT, True),
-  'skiabot-shuttle-ubuntu12-nexus5-002':
-      SlaveInfo('018dff3520c970f6', DEFAULT_SDK_ROOT, True),
-  'skiabot-shuttle-ubuntu15-nexus6-001':
-      SlaveInfo('ZX1G22JJWS', DEFAULT_SDK_ROOT, True),
-  'skiabot-shuttle-ubuntu15-nexus6-002':
-      SlaveInfo('ZX1G22JN35', DEFAULT_SDK_ROOT, True),
-  'skiabot-shuttle-ubuntu15-nexus6-003':
-      SlaveInfo('ZX1G22JXXM', DEFAULT_SDK_ROOT, True),
-  'skiabot-shuttle-ubuntu12-nexus7-001':
-      SlaveInfo('015d210a13480604', DEFAULT_SDK_ROOT, True),
-  'skiabot-shuttle-ubuntu12-nexus7-002':
-      SlaveInfo('015d18848c280217', DEFAULT_SDK_ROOT, True),
-  'skiabot-shuttle-ubuntu12-nexus7-003':
-      SlaveInfo('015d16897c401e17', DEFAULT_SDK_ROOT, True),
-  'skiabot-shuttle-ubuntu12-nexus9-001':
-      SlaveInfo('HT43RJT00022', DEFAULT_SDK_ROOT, True),
-  'skiabot-shuttle-ubuntu12-nexus9-002':
-      SlaveInfo('HT4AEJT03112', DEFAULT_SDK_ROOT, True),
-  'skiabot-shuttle-ubuntu12-nexus9-003':
-      SlaveInfo('HT4ADJT03339', DEFAULT_SDK_ROOT, True),
-  'skiabot-shuttle-ubuntu12-nexus10-001':
-      SlaveInfo('R32C801B5LH', DEFAULT_SDK_ROOT, True),
-  'skiabot-shuttle-ubuntu12-nexus10-003':
-      SlaveInfo('R32CB017X2L', DEFAULT_SDK_ROOT, True),
-  'skiabot-shuttle-ubuntu12-nexusplayer-001':
-      SlaveInfo('D76C708B', DEFAULT_SDK_ROOT, True),
-  'skiabot-shuttle-ubuntu12-nexusplayer-002':
-      SlaveInfo('8AB5139A', DEFAULT_SDK_ROOT, True),
-  'skiabot-shuttle-ubuntu15-nvidia-shield-001':
-      SlaveInfo('04217150066510000078', MACMINI_SDK_ROOT, False),
-  'skiabot-linux-housekeeper-003':
-      SlaveInfo('noserial', DEFAULT_SDK_ROOT, False),
-  'vm690-m3': SlaveInfo('noserial', MACMINI_SDK_ROOT, False),
-  'vm691-m3': SlaveInfo('noserial', MACMINI_SDK_ROOT, False),
-  'vm692-m3': SlaveInfo('noserial', MACMINI_SDK_ROOT, False),
-  'vm693-m3': SlaveInfo('noserial', MACMINI_SDK_ROOT, False),
-  'default':
-      SlaveInfo('noserial', DEFAULT_SDK_ROOT, False),
-}
-
-
-if __name__ == '__main__':
-  print json.dumps(SLAVE_INFO)  # pragma: no cover
-