Triggering jobs on new macbook airs

Bug: 758632
Change-Id: I7fc16ec27f1e24978c85c0b4a58970b19ffc5045
Reviewed-on: https://chromium-review.googlesource.com/955924Reviewed-by: Ashley Enstad <ashleymarie@chromium.org>
Reviewed-by: John Budorick <jbudorick@chromium.org>
Commit-Queue: Emily Hanley <eyaich@chromium.org>
Cr-Commit-Position: refs/heads/master@{#542217}

chrome/test/BUILD.gn

@@ -2124,10 +2124,7 @@ group("telemetry_perf_tests_experimental") {
 group("performance_test_suite") {
   testonly = true
   deps = [
-    # Comment this in when testing on a trybot so it does
-    # not have to rebuild chrome each time.
-    "//chrome/test:telemetry_perf_tests_experimental",
-    #"//chrome/test:telemetry_perf_tests",
+    "//chrome/test:telemetry_perf_tests",
   ]
 
   data = [

testing/buildbot/chromium.perf.fyi.json

@@ -400,6 +400,50 @@
       }
     ]
   },
+  "Mac 10.12 Laptop Low End": {
+    "isolated_scripts": [
+      {
+        "args": [
+          "-v",
+          "--xvfb",
+          "--browser=release_x64"
+        ],
+        "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": [
+            {
+              "pool": "Chrome-perf-fyi"
+            }
+          ],
+          "expiration": 36000,
+          "hard_timeout": 36000,
+          "ignore_task_failure": false,
+          "io_timeout": 3600,
+          "shards": 26,
+          "upload_test_results": true
+        },
+        "trigger_script": {
+          "args": [
+            "--multiple-trigger-configs",
+            "[{\"id\": \"build195-a9\"}, {\"id\": \"build196-a9\"}, {\"id\": \"build197-a9\"}, {\"id\": \"build198-a9\"}, {\"id\": \"build199-a9\"}, {\"id\": \"build200-a9\"}, {\"id\": \"build201-a9\"}, {\"id\": \"build202-a9\"}, {\"id\": \"build203-a9\"}, {\"id\": \"build204-a9\"}, {\"id\": \"build205-a9\"}, {\"id\": \"build206-a9\"}, {\"id\": \"build207-a9\"}, {\"id\": \"build208-a9\"}, {\"id\": \"build209-a9\"}, {\"id\": \"build210-a9\"}, {\"id\": \"build211-a9\"}, {\"id\": \"build212-a9\"}, {\"id\": \"build213-a9\"}, {\"id\": \"build214-a9\"}, {\"id\": \"build215-a9\"}, {\"id\": \"build216-a9\"}, {\"id\": \"build217-a9\"}, {\"id\": \"build218-a9\"}, {\"id\": \"build219-a9\"}, {\"id\": \"build220-a9\"}]"
+          ],
+          "script": "//testing/trigger_scripts/perf_device_trigger.py"
+        }
+      }
+    ]
+  },
   "Mojo Linux Perf": {
     "isolated_scripts": [
       {
@@ -477,49 +521,6 @@
           ],
           "script": "//testing/trigger_scripts/perf_device_trigger.py"
         }
-      },
-      {
-        "args": [
-          "-v",
-          "--xvfb",
-          "--browser=reference",
-          "--testing=true"
-        ],
-        "isolate_name": "performance_test_suite",
-        "merge": {
-          "args": [
-            "--configuration-name",
-            "buildbot-test",
-            "--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": [
-            {
-              "pool": "Chrome-perf-fyi"
-            }
-          ],
-          "expiration": 36000,
-          "hard_timeout": 36000,
-          "ignore_task_failure": false,
-          "io_timeout": 3600,
-          "shards": 1,
-          "upload_test_results": true
-        },
-        "trigger_script": {
-          "args": [
-            "--multiple-trigger-configs",
-            "[{\"id\": \"swarm823-c4\"}]"
-          ],
-          "script": "//testing/trigger_scripts/perf_device_trigger.py"
-        }
       }
     ]
   }

tools/perf/process_perf_results.py

@@ -22,6 +22,9 @@ def _upload_perf_results(json_to_upload, name, configuration_name,
     build_properties, oauth_file, tmp_dir):
   """Upload the contents of result JSON(s) to the perf dashboard."""
   build_properties = json.loads(build_properties)
+  if not configuration_name:
+    # we are deprecating perf-id crbug.com/817823
+    configuration_name = build_properties['buildername'],
   args = [
       '--tmp-dir', tmp_dir,
       '--buildername', build_properties['buildername'],