Triggering jobs on pixel2 and pixel2 webview on chromium.perf.fyi

This change includes:
1) Adding new isolate for webview
2) Updating presentation for luci configs
  a) adding new pixel bots
  b) removing Mac 10.12 Laptop Low End that no longer exists
3) Generating new json for fyi waterfall
4) updating script on bot to ignore reference build for android

Bug: 817872
Change-Id: I8376b50dd0fcd8595977609205e8fbd8cb2985b2
Reviewed-on: https://chromium-review.googlesource.com/1039769
Commit-Queue: Emily Hanley <eyaich@chromium.org>
Reviewed-by: Nodir Turakulov <nodir@chromium.org>
Reviewed-by: John Budorick <jbudorick@chromium.org>
Cr-Commit-Position: refs/heads/master@{#555828}

chrome/test/BUILD.gn

@@ -2180,6 +2180,16 @@ group("performance_test_suite") {
   ]
 }
 
+# Difference between this and performance_test_suite is that this runs a devil
+# script before the build, to remove the system webview. See
+# //testing/buildbot/gn_isolate_map.pyl
+group("performance_webview_test_suite") {
+  testonly = true
+  deps = [
+    "//chrome/test:performance_test_suite",
+  ]
+}
+
 # Difference between this and telemetry_perf_tests is that this runs a devil
 # script before the build, to remove the system webview. See
 # //testing/buildbot/gn_isolate_map.pyl

infra/config/global/luci-milo-dev.cfg

@@ -2912,6 +2912,14 @@ consoles: {
     name: "buildbot/chromium.perf.fyi/Android Nexus 5X Perf FYI"
     category: "android"
   }
+  builders: {
+    name: "buildbot/chromium.perf.fyi/android-pixel2-perf"
+    category: "android"
+  }
+  builders: {
+    name: "buildbot/chromium.perf.fyi/android-pixel2_webview-perf"
+    category: "android"
+  }
   builders: {
     name: "buildbot/chromium.perf.fyi/Mojo Linux Perf"
     category: "linux"
@@ -2924,10 +2932,6 @@ consoles: {
     name: "buildbot/chromium.perf.fyi/One Buildbot Step Test Builder"
     category: "linux"
   }
-  builders: {
-    name: "buildbot/chromium.perf.fyi/Mac 10.12 Laptop Low End"
-    category: "mac"
-  }
   builders: {
     name: "buildbot/chromium.perf.fyi/Mac 10.13 Laptop High End"
     category: "mac"

infra/config/global/luci-milo.cfg

@@ -3327,6 +3327,14 @@ consoles: {
     name: "buildbot/chromium.perf.fyi/Android Nexus 5X Perf FYI"
     category: "android"
   }
+  builders: {
+    name: "buildbot/chromium.perf.fyi/android-pixel2-perf"
+    category: "android"
+  }
+  builders: {
+    name: "buildbot/chromium.perf.fyi/android-pixel2_webview-perf"
+    category: "android"
+  }
   builders: {
     name: "buildbot/chromium.perf.fyi/Mojo Linux Perf"
     category: "linux"
@@ -3339,10 +3347,6 @@ consoles: {
     name: "buildbot/chromium.perf.fyi/One Buildbot Step Test Builder"
     category: "linux"
   }
-  builders: {
-    name: "buildbot/chromium.perf.fyi/Mac 10.12 Laptop Low End"
-    category: "mac"
-  }
   builders: {
     name: "buildbot/chromium.perf.fyi/Mac 10.13 Laptop High End"
     category: "mac"

testing/buildbot/chromium.perf.fyi.json

@@ -695,5 +695,100 @@
         }
       }
     ]
+  },
+  "android-pixel2-perf": {
+    "isolated_scripts": [
+      {
+        "args": [
+          "-v",
+          "--browser=android-chromium",
+          "--upload-results"
+        ],
+        "isolate_name": "performance_test_suite",
+        "merge": {
+          "args": [
+            "--service-account-file",
+            "/creds/service_accounts/service-account-chromium-perf-histograms.json"
+          ],
+          "script": "//tools/perf/process_perf_results.py"
+        },
+        "name": "performance_test_suite",
+        "override_compile_targets": [
+          "performance_test_suite"
+        ],
+        "swarming": {
+          "can_use_on_swarming_builders": true,
+          "dimension_sets": [
+            {
+              "device_is": "O",
+              "device_type": "walleye",
+              "os": "Android",
+              "pool": "chrome.test.perf-fyi"
+            }
+          ],
+          "expiration": 36000,
+          "hard_timeout": 36000,
+          "ignore_task_failure": false,
+          "io_timeout": 1800,
+          "shards": 7,
+          "upload_test_results": true
+        },
+        "trigger_script": {
+          "args": [
+            "--multiple-dimension-script-verbose",
+            "True"
+          ],
+          "script": "//testing/trigger_scripts/perf_device_trigger.py"
+        }
+      }
+    ]
+  },
+  "android-pixel2_webview-perf": {
+    "isolated_scripts": [
+      {
+        "args": [
+          "-v",
+          "--browser=android-webview",
+          "--upload-results",
+          "--webview-embedder-apk=../../out/Release/apks/SystemWebViewShell.apk"
+        ],
+        "isolate_name": "performance_webview_test_suite",
+        "merge": {
+          "args": [
+            "--service-account-file",
+            "/creds/service_accounts/service-account-chromium-perf-histograms.json"
+          ],
+          "script": "//tools/perf/process_perf_results.py"
+        },
+        "name": "performance_webview_test_suite",
+        "override_compile_targets": [
+          "performance_webview_test_suite"
+        ],
+        "swarming": {
+          "can_use_on_swarming_builders": true,
+          "dimension_sets": [
+            {
+              "device_is": "O",
+              "device_type": "walleye",
+              "os": "Android",
+              "pool": "chrome.test.perf-webview-fyi"
+            }
+          ],
+          "expiration": 36000,
+          "hard_timeout": 36000,
+          "ignore_task_failure": false,
+          "io_timeout": 1800,
+          "shards": 7,
+          "upload_test_results": true
+        },
+        "trigger_script": {
+          "args": [
+            "--multiple-dimension-script-verbose",
+            "True"
+          ],
+          "script": "//testing/trigger_scripts/perf_device_trigger.py"
+        }
+      }
+    ]
   }
 }

testing/buildbot/gn_isolate_map.pyl

@@ -1095,6 +1095,21 @@
       "../../tools/perf/run_benchmark",
     ],
   },
+  "performance_webview_test_suite": {
+    "label": "//chrome/test:performance_webview_test_suite",
+    "type": "script",
+    "script": "//third_party/catapult/devil/devil/android/tools/system_app.py",
+    "args": [
+      "remove",
+      "--package",
+      "com.android.webview",
+      "com.google.android.webview",
+      "-v",
+      "--",
+      "../../testing/scripts/run_performance_tests.py",
+      "../../tools/perf/run_benchmark",
+    ],
+  },
   "telemetry_perf_webview_tests": {
     "label": "//chrome/test:telemetry_perf_webview_tests",
     "type": "script",

testing/scripts/run_performance_tests.py

@@ -244,16 +244,22 @@ def main():
       sharding = None
       sharding = sharding_map[shard_index]['benchmarks']
 
+      # We don't execute tests on the reference build on android webview
+      # since telemetry doesn't support it.  See crbug.com/612455
+      is_webview = any(('browser' in a and 'webview' in a) for a in rest_args)
+
       for benchmark in sharding:
         # Need to run the benchmark twice on browser and reference build
         return_code = (execute_benchmark(
             benchmark, isolated_out_dir, args, rest_args, False) or return_code)
         # We ignore the return code of the reference build since we do not
         # monitor it.
-        execute_benchmark(benchmark, isolated_out_dir, args, rest_args, True)
+        if not is_webview:
+          execute_benchmark(benchmark, isolated_out_dir, args, rest_args, True)
 
   return return_code
 
+
 # This is not really a "script test" so does not need to manually add
 # any additional compile targets.
 def main_compile_targets(args):

tools/perf/core/perf_data_generator.py

@@ -1024,6 +1024,40 @@ NEW_PERF_RECIPE_FYI_TESTERS = {
       },
       'device_ids': [
       ],
+    },
+    'android-pixel2_webview-perf': {
+      'tests': [
+        {
+          'isolate': 'performance_webview_test_suite',
+          'num_shards': 7
+        }
+      ],
+      'platform': 'android-webview',
+      'dimension': {
+        'pool': 'chrome.test.perf-webview-fyi',
+        'os': 'Android',
+        'device_type': 'walleye',
+        'device_is': 'O'
+      },
+      'device_ids': [
+      ],
+    },
+    'android-pixel2-perf': {
+      'tests': [
+        {
+          'isolate': 'performance_test_suite',
+          'num_shards': 7
+        }
+      ],
+      'platform': 'android',
+      'dimension': {
+        'pool': 'chrome.test.perf-fyi',
+        'os': 'Android',
+        'device_type': 'walleye',
+        'device_is': 'O'
+      },
+      'device_ids': [
+      ],
     }
   }
 }
@@ -1146,10 +1180,9 @@ def generate_telemetry_args(tester_config):
   if tester_config.get('testing', False):
     browser_name = 'reference'
   elif tester_config['platform'] == 'android':
-    if tester_config.get('replace_system_webview', False):
-      browser_name = 'android-webview'
-    else:
-      browser_name = 'android-chromium'
+    browser_name = 'android-chromium'
+  elif tester_config['platform'] == 'android-webview':
+    browser_name = 'android-webview'
   elif (tester_config['platform'] == 'win'
     and tester_config['target_bits'] == 64):
     browser_name = 'release_x64'