Turn Android FYI Release (NVIDIA Shield TV) into swarmed bot

BUG=810917

Cq-Include-Trybots: master.tryserver.chromium.android:android_optional_gpu_tests_rel;master.tryserver.chromium.linux:linux_optional_gpu_tests_rel;master.tryserver.chromium.mac:mac_optional_gpu_tests_rel;master.tryserver.chromium.win:win_optional_gpu_tests_rel
Change-Id: I5370ff9d3a8cc943e511f8cc5da272d07d47406d
Reviewed-on: https://chromium-review.googlesource.com/953325Reviewed-by: Kenneth Russell <kbr@chromium.org>
Commit-Queue: Yuly Novikov <ynovikov@chromium.org>
Cr-Commit-Position: refs/heads/master@{#541634}

content/test/gpu/generate_buildbot_json.py

@@ -797,16 +797,14 @@ FYI_WATERFALL = {
     'Android FYI Release (NVIDIA Shield TV)': {
       'swarming_dimensions': [
         {
-          # There are no PCI IDs on Android.
-          # This is a hack to get the script working.
-          'gpu': '0000:0000',
-          'os': 'Android'
+          'device_type': 'foster',
+          'device_os': 'N',
+          'os': 'Android',
+          'pool': 'Chrome-GPU',
         },
       ],
       'build_config': 'android-chromium',
-      # This bot is a one-off and doesn't have similar slaves in the
-      # swarming pool.
-      'swarming': False,
+      'swarming': True,
       'os_type': 'android',
     },
     'Android FYI dEQP Release (Nexus 5X)': {

testing/buildbot/chromium.gpu.fyi.json

@@ -915,7 +915,7 @@
     "gtest_tests": [
       {
         "swarming": {
-          "can_use_on_swarming_builders": false,
+          "can_use_on_swarming_builders": true,
           "cipd_packages": [
             {
               "cipd_package": "infra/tools/luci/logdog/butler/${platform}",
@@ -925,8 +925,10 @@
           ],
           "dimension_sets": [
             {
-              "gpu": "0000:0000",
-              "os": "Android"
+              "device_os": "N",
+              "device_type": "foster",
+              "os": "Android",
+              "pool": "Chrome-GPU"
             }
           ],
           "output_links": [
@@ -945,7 +947,7 @@
       },
       {
         "swarming": {
-          "can_use_on_swarming_builders": false,
+          "can_use_on_swarming_builders": true,
           "cipd_packages": [
             {
               "cipd_package": "infra/tools/luci/logdog/butler/${platform}",
@@ -955,8 +957,10 @@
           ],
           "dimension_sets": [
             {
-              "gpu": "0000:0000",
-              "os": "Android"
+              "device_os": "N",
+              "device_type": "foster",
+              "os": "Android",
+              "pool": "Chrome-GPU"
             }
           ],
           "output_links": [
@@ -975,7 +979,7 @@
       },
       {
         "swarming": {
-          "can_use_on_swarming_builders": false,
+          "can_use_on_swarming_builders": true,
           "cipd_packages": [
             {
               "cipd_package": "infra/tools/luci/logdog/butler/${platform}",
@@ -985,8 +989,10 @@
           ],
           "dimension_sets": [
             {
-              "gpu": "0000:0000",
-              "os": "Android"
+              "device_os": "N",
+              "device_type": "foster",
+              "os": "Android",
+              "pool": "Chrome-GPU"
             }
           ],
           "output_links": [
@@ -1005,7 +1011,7 @@
       },
       {
         "swarming": {
-          "can_use_on_swarming_builders": false,
+          "can_use_on_swarming_builders": true,
           "cipd_packages": [
             {
               "cipd_package": "infra/tools/luci/logdog/butler/${platform}",
@@ -1015,8 +1021,10 @@
           ],
           "dimension_sets": [
             {
-              "gpu": "0000:0000",
-              "os": "Android"
+              "device_os": "N",
+              "device_type": "foster",
+              "os": "Android",
+              "pool": "Chrome-GPU"
             }
           ],
           "output_links": [
@@ -1035,7 +1043,7 @@
       },
       {
         "swarming": {
-          "can_use_on_swarming_builders": false,
+          "can_use_on_swarming_builders": true,
           "cipd_packages": [
             {
               "cipd_package": "infra/tools/luci/logdog/butler/${platform}",
@@ -1045,8 +1053,10 @@
           ],
           "dimension_sets": [
             {
-              "gpu": "0000:0000",
-              "os": "Android"
+              "device_os": "N",
+              "device_type": "foster",
+              "os": "Android",
+              "pool": "Chrome-GPU"
             }
           ],
           "output_links": [
@@ -1080,11 +1090,13 @@
           "telemetry_gpu_integration_test"
         ],
         "swarming": {
-          "can_use_on_swarming_builders": false,
+          "can_use_on_swarming_builders": true,
           "dimension_sets": [
             {
-              "gpu": "0000:0000",
-              "os": "Android"
+              "device_os": "N",
+              "device_type": "foster",
+              "os": "Android",
+              "pool": "Chrome-GPU"
             }
           ]
         }
@@ -1104,11 +1116,13 @@
           "telemetry_gpu_integration_test"
         ],
         "swarming": {
-          "can_use_on_swarming_builders": false,
+          "can_use_on_swarming_builders": true,
           "dimension_sets": [
             {
-              "gpu": "0000:0000",
-              "os": "Android"
+              "device_os": "N",
+              "device_type": "foster",
+              "os": "Android",
+              "pool": "Chrome-GPU"
             }
           ]
         }
@@ -1128,11 +1142,13 @@
           "telemetry_gpu_integration_test"
         ],
         "swarming": {
-          "can_use_on_swarming_builders": false,
+          "can_use_on_swarming_builders": true,
           "dimension_sets": [
             {
-              "gpu": "0000:0000",
-              "os": "Android"
+              "device_os": "N",
+              "device_type": "foster",
+              "os": "Android",
+              "pool": "Chrome-GPU"
             }
           ]
         }
@@ -1152,11 +1168,13 @@
           "telemetry_gpu_integration_test"
         ],
         "swarming": {
-          "can_use_on_swarming_builders": false,
+          "can_use_on_swarming_builders": true,
           "dimension_sets": [
             {
-              "gpu": "0000:0000",
-              "os": "Android"
+              "device_os": "N",
+              "device_type": "foster",
+              "os": "Android",
+              "pool": "Chrome-GPU"
             }
           ]
         }
@@ -1170,9 +1188,9 @@
           "-v",
           "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc",
           "--expected-vendor-id",
-          "0000",
+          "0",
           "--expected-device-id",
-          "0000"
+          "0"
         ],
         "isolate_name": "telemetry_gpu_integration_test",
         "name": "info_collection_tests",
@@ -1180,11 +1198,13 @@
           "telemetry_gpu_integration_test"
         ],
         "swarming": {
-          "can_use_on_swarming_builders": false,
+          "can_use_on_swarming_builders": true,
           "dimension_sets": [
             {
-              "gpu": "0000:0000",
-              "os": "Android"
+              "device_os": "N",
+              "device_type": "foster",
+              "os": "Android",
+              "pool": "Chrome-GPU"
             }
           ]
         }
@@ -1211,11 +1231,13 @@
           "telemetry_gpu_integration_test"
         ],
         "swarming": {
-          "can_use_on_swarming_builders": false,
+          "can_use_on_swarming_builders": true,
           "dimension_sets": [
             {
-              "gpu": "0000:0000",
-              "os": "Android"
+              "device_os": "N",
+              "device_type": "foster",
+              "os": "Android",
+              "pool": "Chrome-GPU"
             }
           ]
         }
@@ -1250,11 +1272,13 @@
           "--download-refimg-from-cloud-storage"
         ],
         "swarming": {
-          "can_use_on_swarming_builders": false,
+          "can_use_on_swarming_builders": true,
           "dimension_sets": [
             {
-              "gpu": "0000:0000",
-              "os": "Android"
+              "device_os": "N",
+              "device_type": "foster",
+              "os": "Android",
+              "pool": "Chrome-GPU"
             }
           ]
         }
@@ -1275,11 +1299,13 @@
           "telemetry_gpu_integration_test"
         ],
         "swarming": {
-          "can_use_on_swarming_builders": false,
+          "can_use_on_swarming_builders": true,
           "dimension_sets": [
             {
-              "gpu": "0000:0000",
-              "os": "Android"
+              "device_os": "N",
+              "device_type": "foster",
+              "os": "Android",
+              "pool": "Chrome-GPU"
             }
           ]
         }
@@ -1299,11 +1325,13 @@
           "telemetry_gpu_integration_test"
         ],
         "swarming": {
-          "can_use_on_swarming_builders": false,
+          "can_use_on_swarming_builders": true,
           "dimension_sets": [
             {
-              "gpu": "0000:0000",
-              "os": "Android"
+              "device_os": "N",
+              "device_type": "foster",
+              "os": "Android",
+              "pool": "Chrome-GPU"
             }
           ]
         }
@@ -1324,11 +1352,13 @@
           "telemetry_gpu_integration_test"
         ],
         "swarming": {
-          "can_use_on_swarming_builders": false,
+          "can_use_on_swarming_builders": true,
           "dimension_sets": [
             {
-              "gpu": "0000:0000",
-              "os": "Android"
+              "device_os": "N",
+              "device_type": "foster",
+              "os": "Android",
+              "pool": "Chrome-GPU"
             }
           ],
           "shards": 6