Move perf tests into the template pools.

Bug: 1060280
Change-Id: I058840f16302b473b206ac9b074107baaf29f412
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2133232Reviewed-by: John Chen <johnchen@chromium.org>
Commit-Queue: John Budorick <jbudorick@chromium.org>
Cr-Commit-Position: refs/heads/master@{#755830}

testing/buildbot/chromium.perf.fyi.json

@@ -28,7 +28,7 @@
               "device_os_flavor": "google",
               "device_type": "bullhead",
               "os": "Android",
-              "pool": "chrome.tests.perf-fyi"
+              "pool": "chrome.tests.perf-fyi.template"
             }
           ],
           "expiration": 7200,
@@ -75,7 +75,7 @@
               "device_os_flavor": "google",
               "device_type": "walleye",
               "os": "Android",
-              "pool": "chrome.tests.perf-fyi"
+              "pool": "chrome.tests.perf-fyi.template"
             }
           ],
           "expiration": 7200,
@@ -123,7 +123,7 @@
               "device_os_flavor": "google",
               "device_type": "walleye",
               "os": "Android",
-              "pool": "chrome.tests.perf-fyi"
+              "pool": "chrome.tests.perf-fyi.template"
             }
           ],
           "expiration": 7200,
@@ -216,7 +216,7 @@
               "gpu": "10de",
               "id": "build186-b7",
               "os": "Ubuntu-14.04",
-              "pool": "chrome.tests.perf-fyi"
+              "pool": "chrome.tests.perf-fyi.template"
             }
           ],
           "expiration": 7200,
@@ -262,7 +262,7 @@
               "gpu": null,
               "id": "build370-a7",
               "os": "Windows-10",
-              "pool": "chrome.tests.perf-fyi"
+              "pool": "chrome.tests.perf-fyi.template"
             }
           ],
           "expiration": 7200,

testing/buildbot/chromium.perf.json

@@ -28,7 +28,7 @@
               "device_os_flavor": "google",
               "device_type": "hammerhead",
               "os": "Android",
-              "pool": "chrome.tests.perf"
+              "pool": "chrome.tests.perf.template"
             }
           ],
           "expiration": 7200,
@@ -75,7 +75,7 @@
               "device_os_flavor": "aosp",
               "device_type": "bullhead",
               "os": "Android",
-              "pool": "chrome.tests.perf-webview"
+              "pool": "chrome.tests.perf-webview.template"
             }
           ],
           "expiration": 7200,
@@ -121,7 +121,7 @@
             {
               "gpu": "10de:1cb3-23.21.13.8792",
               "os": "Windows-2008ServerR2-SP1",
-              "pool": "chrome.tests.perf",
+              "pool": "chrome.tests.perf.template",
               "synthetic_product_name": "PowerEdge R220 [01] (Dell Inc.)"
             }
           ],
@@ -167,7 +167,7 @@
             {
               "gpu": "102b:0532-6.1.7600.16385",
               "os": "Windows-2008ServerR2-SP1",
-              "pool": "chrome.tests.perf",
+              "pool": "chrome.tests.perf.template",
               "synthetic_product_name": "PowerEdge R210 II (Dell Inc.)"
             }
           ],
@@ -211,7 +211,7 @@
           "dimension_sets": [
             {
               "os": "Ubuntu-16.04",
-              "pool": "chrome.tests"
+              "pool": "chrome.tests.template"
             }
           ],
           "expiration": 7200,
@@ -236,7 +236,7 @@
           "dimension_sets": [
             {
               "os": "Ubuntu-16.04",
-              "pool": "chrome.tests"
+              "pool": "chrome.tests.template"
             }
           ],
           "expiration": 7200,
@@ -261,7 +261,7 @@
           "dimension_sets": [
             {
               "os": "Ubuntu-16.04",
-              "pool": "chrome.tests"
+              "pool": "chrome.tests.template"
             }
           ],
           "expiration": 7200,
@@ -286,7 +286,7 @@
           "dimension_sets": [
             {
               "os": "Ubuntu-16.04",
-              "pool": "chrome.tests"
+              "pool": "chrome.tests.template"
             }
           ],
           "expiration": 7200,
@@ -311,7 +311,7 @@
           "dimension_sets": [
             {
               "os": "Ubuntu-16.04",
-              "pool": "chrome.tests"
+              "pool": "chrome.tests.template"
             }
           ],
           "expiration": 7200,
@@ -336,7 +336,7 @@
           "dimension_sets": [
             {
               "os": "Ubuntu-16.04",
-              "pool": "chrome.tests"
+              "pool": "chrome.tests.template"
             }
           ],
           "expiration": 7200,
@@ -361,7 +361,7 @@
           "dimension_sets": [
             {
               "os": "Ubuntu-16.04",
-              "pool": "chrome.tests"
+              "pool": "chrome.tests.template"
             }
           ],
           "expiration": 7200,
@@ -386,7 +386,7 @@
           "dimension_sets": [
             {
               "os": "Ubuntu-16.04",
-              "pool": "chrome.tests"
+              "pool": "chrome.tests.template"
             }
           ],
           "expiration": 7200,
@@ -411,7 +411,7 @@
           "dimension_sets": [
             {
               "os": "Ubuntu-16.04",
-              "pool": "chrome.tests"
+              "pool": "chrome.tests.template"
             }
           ],
           "expiration": 7200,
@@ -449,7 +449,7 @@
               "device_os_flavor": "google",
               "device_type": "gobo",
               "os": "Android",
-              "pool": "chrome.tests.perf"
+              "pool": "chrome.tests.perf.template"
             }
           ],
           "expiration": 7200,
@@ -495,7 +495,7 @@
               "device_os_flavor": "google",
               "device_type": "gobo",
               "os": "Android",
-              "pool": "chrome.tests.perf-webview"
+              "pool": "chrome.tests.perf-webview.template"
             }
           ],
           "expiration": 7200,
@@ -542,7 +542,7 @@
               "device_os_flavor": "google",
               "device_type": "walleye",
               "os": "Android",
-              "pool": "chrome.tests.perf"
+              "pool": "chrome.tests.perf.template"
             }
           ],
           "expiration": 7200,
@@ -588,7 +588,7 @@
               "device_os_flavor": "google",
               "device_type": "walleye",
               "os": "Android",
-              "pool": "chrome.tests.perf-weblayer"
+              "pool": "chrome.tests.perf-weblayer.template"
             }
           ],
           "expiration": 7200,
@@ -634,7 +634,7 @@
               "device_os_flavor": "google",
               "device_type": "walleye",
               "os": "Android",
-              "pool": "chrome.tests.perf-webview"
+              "pool": "chrome.tests.perf-webview.template"
             }
           ],
           "expiration": 7200,
@@ -677,7 +677,7 @@
           "dimension_sets": [
             {
               "os": "Ubuntu-16.04",
-              "pool": "chrome.tests"
+              "pool": "chrome.tests.template"
             }
           ],
           "expiration": 7200,
@@ -702,7 +702,7 @@
           "dimension_sets": [
             {
               "os": "Ubuntu-16.04",
-              "pool": "chrome.tests"
+              "pool": "chrome.tests.template"
             }
           ],
           "expiration": 7200,
@@ -727,7 +727,7 @@
           "dimension_sets": [
             {
               "os": "Ubuntu-16.04",
-              "pool": "chrome.tests"
+              "pool": "chrome.tests.template"
             }
           ],
           "expiration": 7200,
@@ -752,7 +752,7 @@
           "dimension_sets": [
             {
               "os": "Ubuntu-16.04",
-              "pool": "chrome.tests"
+              "pool": "chrome.tests.template"
             }
           ],
           "expiration": 7200,
@@ -777,7 +777,7 @@
           "dimension_sets": [
             {
               "os": "Ubuntu-16.04",
-              "pool": "chrome.tests"
+              "pool": "chrome.tests.template"
             }
           ],
           "expiration": 7200,
@@ -802,7 +802,7 @@
           "dimension_sets": [
             {
               "os": "Ubuntu-16.04",
-              "pool": "chrome.tests"
+              "pool": "chrome.tests.template"
             }
           ],
           "expiration": 7200,
@@ -827,7 +827,7 @@
           "dimension_sets": [
             {
               "os": "Ubuntu-16.04",
-              "pool": "chrome.tests"
+              "pool": "chrome.tests.template"
             }
           ],
           "expiration": 7200,
@@ -852,7 +852,7 @@
           "dimension_sets": [
             {
               "os": "Ubuntu-16.04",
-              "pool": "chrome.tests"
+              "pool": "chrome.tests.template"
             }
           ],
           "expiration": 7200,
@@ -894,7 +894,7 @@
             {
               "gpu": "10de:1cb3-384.90",
               "os": "Ubuntu-14.04",
-              "pool": "chrome.tests.perf",
+              "pool": "chrome.tests.perf.template",
               "synthetic_product_name": "PowerEdge R230 (Dell Inc.)"
             }
           ],
@@ -941,7 +941,7 @@
             {
               "gpu": "8086:1626",
               "os": "Mac-10.12.6",
-              "pool": "chrome.tests.perf",
+              "pool": "chrome.tests.perf.template",
               "synthetic_product_name": "MacBookAir7,2_x86-64-i5-5350U_Intel Broadwell HD Graphics 6000_8192_APPLE SSD SM0128G"
             }
           ],
@@ -988,7 +988,7 @@
             {
               "gpu": "1002:6821-4.0.20-3.2.8",
               "os": "Mac-10.13.3",
-              "pool": "chrome.tests.perf",
+              "pool": "chrome.tests.perf.template",
               "synthetic_product_name": "MacBookPro11,5_x86-64-i7-4870HQ_AMD Radeon R8 M370X 4.0.20 [3.2.8]_Intel Haswell Iris Pro Graphics 5200 4.0.20 [3.2.8]_16384_APPLE SSD SM0512G"
             }
           ],
@@ -1040,7 +1040,7 @@
             {
               "gpu": "8086:5912-23.20.16.4877",
               "os": "Windows-10-16299.309",
-              "pool": "chrome.tests.perf",
+              "pool": "chrome.tests.perf.template",
               "synthetic_product_name": "OptiPlex 7050 (Dell Inc.)"
             }
           ],
@@ -1087,7 +1087,7 @@
             {
               "gpu": "8086:1616-20.19.15.5070",
               "os": "Windows-10-18363.476",
-              "pool": "chrome.tests.perf"
+              "pool": "chrome.tests.perf.template"
             }
           ],
           "expiration": 7200,

tools/perf/core/perf_json_config_validator.py

@@ -13,13 +13,23 @@ _VALID_SWARMING_DIMENSIONS = {
     'gpu', 'device_ids', 'os', 'pool', 'perf_tests', 'perf_tests_with_args',
     'device_os', 'device_type', 'device_os_flavor', 'id',
     'synthetic_product_name'}
+# TODO(crbug.com/812428): Remove the template versions once the pools
+# get merged back in.
 _DEFAULT_VALID_PERF_POOLS = {
-    'chrome.tests.perf', 'chrome.tests.perf-webview',
+    'chrome.tests.perf',
+    'chrome.tests.perf-webview',
     'chrome.tests.perf-weblayer',
-    'chrome.tests.perf-fyi', 'chrome.tests.perf-webview-fyi'}
+    'chrome.tests.perf-fyi',
+    'chrome.tests.perf-webview-fyi',
+    'chrome.tests.perf.template',
+    'chrome.tests.perf-webview.template',
+    'chrome.tests.perf-weblayer.template',
+    'chrome.tests.perf-fyi.template',
+    'chrome.tests.perf-webview-fyi.template',
+}
 _VALID_PERF_POOLS = {
-    'android-builder-perf': {'chrome.tests'},
-    'android_arm64-builder-perf': {'chrome.tests'},
+    'android-builder-perf': {'chrome.tests', 'chrome.tests.template'},
+    'android_arm64-builder-perf': {'chrome.tests', 'chrome.tests.template'},
     'chromeos-kevin-perf-fyi': {'luci.chrome.cros-dut'},
 }