LUCI configuration for mac12*-blink-rel

These builders will allow us to rebaseline for 'mac12*' ports so that
the web tests can pass.

Bug: 1323327
Change-Id: I7813f3ed66a85bb860ffd86417f087cfcce85167
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3645678
Commit-Queue: Jonathan Lee <jonathanjlee@google.com>
Reviewed-by: Erik Staab <estaab@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1004869}

infra/config/generated/builders/try/mac12.0-blink-rel/properties.json

@@ -0,0 +1,16 @@
+{
+  "$build/goma": {
+    "rpc_extra_params": "?prod",
+    "server_host": "goma.chromium.org",
+    "use_luci_auth": true
+  },
+  "$recipe_engine/resultdb/test_presentation": {
+    "column_keys": [],
+    "grouping_keys": [
+      "status",
+      "v.test_suite"
+    ]
+  },
+  "builder_group": "tryserver.blink",
+  "recipe": "chromium_trybot"
+}

infra/config/generated/builders/try/mac12.0.arm64-blink-rel/properties.json

@@ -0,0 +1,16 @@
+{
+  "$build/goma": {
+    "rpc_extra_params": "?prod",
+    "server_host": "goma.chromium.org",
+    "use_luci_auth": true
+  },
+  "$recipe_engine/resultdb/test_presentation": {
+    "column_keys": [],
+    "grouping_keys": [
+      "status",
+      "v.test_suite"
+    ]
+  },
+  "builder_group": "tryserver.blink",
+  "recipe": "chromium_trybot"
+}

infra/config/generated/luci/commit-queue.cfg

@@ -1689,6 +1689,14 @@ config_groups {
         name: "chromium/try/mac11.0.arm64-blink-rel"
         includable_only: true
       }
+      builders {
+        name: "chromium/try/mac12.0-blink-rel"
+        includable_only: true
+      }
+      builders {
+        name: "chromium/try/mac12.0.arm64-blink-rel"
+        includable_only: true
+      }
       builders {
         name: "chromium/try/mac_chromium_10.11_rel_ng"
         includable_only: true

infra/config/generated/luci/cr-buildbucket.cfg

@@ -71126,6 +71126,184 @@ buckets {
         }
       }
     }
+    builders {
+      name: "mac12.0-blink-rel"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "builderless:1"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Mac"
+      dimensions: "pool:luci.chromium.try"
+      dimensions: "ssd:1"
+      exe {
+        cipd_package: "infra/chromium/bootstrapper/${platform}"
+        cipd_version: "latest"
+        cmd: "bootstrapper"
+      }
+      properties:
+        '{'
+        '  "$bootstrap/exe": {'
+        '    "exe": {'
+        '      "cipd_package": "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build",'
+        '      "cipd_version": "refs/heads/main",'
+        '      "cmd": ['
+        '        "luciexe"'
+        '      ]'
+        '    }'
+        '  },'
+        '  "$bootstrap/properties": {'
+        '    "properties_file": "infra/config/generated/builders/try/mac12.0-blink-rel/properties.json",'
+        '    "top_level_project": {'
+        '      "ref": "refs/heads/main",'
+        '      "repo": {'
+        '        "host": "chromium.googlesource.com",'
+        '        "project": "chromium/src"'
+        '      }'
+        '    }'
+        '  },'
+        '  "builder_group": "tryserver.blink",'
+        '  "led_builder_is_bootstrapped": true,'
+        '  "recipe": "chromium_trybot"'
+        '}'
+      execution_timeout_secs: 14400
+      expiration_secs: 7200
+      grace_period {
+        seconds: 120
+      }
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "chrome-luci-data"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+        bq_exports {
+          project: "chrome-luci-data"
+          dataset: "chromium"
+          table: "gpu_try_test_results"
+          test_results {
+            predicate {
+              test_id_regexp: "ninja://chrome/test:telemetry_gpu_integration_test[^/]*/.+"
+            }
+          }
+        }
+        bq_exports {
+          project: "chrome-luci-data"
+          dataset: "chromium"
+          table: "blink_web_tests_try_test_results"
+          test_results {
+            predicate {
+              test_id_regexp: "ninja://[^/]*blink_web_tests/.+"
+            }
+          }
+        }
+        history_options {
+          use_invocation_timestamp: true
+        }
+      }
+    }
+    builders {
+      name: "mac12.0.arm64-blink-rel"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "builderless:1"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Mac"
+      dimensions: "pool:luci.chromium.try"
+      dimensions: "ssd:1"
+      exe {
+        cipd_package: "infra/chromium/bootstrapper/${platform}"
+        cipd_version: "latest"
+        cmd: "bootstrapper"
+      }
+      properties:
+        '{'
+        '  "$bootstrap/exe": {'
+        '    "exe": {'
+        '      "cipd_package": "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build",'
+        '      "cipd_version": "refs/heads/main",'
+        '      "cmd": ['
+        '        "luciexe"'
+        '      ]'
+        '    }'
+        '  },'
+        '  "$bootstrap/properties": {'
+        '    "properties_file": "infra/config/generated/builders/try/mac12.0.arm64-blink-rel/properties.json",'
+        '    "top_level_project": {'
+        '      "ref": "refs/heads/main",'
+        '      "repo": {'
+        '        "host": "chromium.googlesource.com",'
+        '        "project": "chromium/src"'
+        '      }'
+        '    }'
+        '  },'
+        '  "builder_group": "tryserver.blink",'
+        '  "led_builder_is_bootstrapped": true,'
+        '  "recipe": "chromium_trybot"'
+        '}'
+      execution_timeout_secs: 14400
+      expiration_secs: 7200
+      grace_period {
+        seconds: 120
+      }
+      caches {
+        name: "win_toolchain"
+        path: "win_toolchain"
+      }
+      build_numbers: YES
+      service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
+      task_template_canary_percentage {
+        value: 5
+      }
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "chrome-luci-data"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+        bq_exports {
+          project: "chrome-luci-data"
+          dataset: "chromium"
+          table: "gpu_try_test_results"
+          test_results {
+            predicate {
+              test_id_regexp: "ninja://chrome/test:telemetry_gpu_integration_test[^/]*/.+"
+            }
+          }
+        }
+        bq_exports {
+          project: "chrome-luci-data"
+          dataset: "chromium"
+          table: "blink_web_tests_try_test_results"
+          test_results {
+            predicate {
+              test_id_regexp: "ninja://[^/]*blink_web_tests/.+"
+            }
+          }
+        }
+        history_options {
+          use_invocation_timestamp: true
+        }
+      }
+    }
     builders {
       name: "mac_chromium_10.11_rel_ng"
       swarming_host: "chromium-swarm.appspot.com"

infra/config/generated/luci/luci-milo.cfg

@@ -16004,6 +16004,12 @@ consoles {
   builders {
     name: "buildbucket/luci.chromium.try/mac11.0.arm64-blink-rel"
   }
+  builders {
+    name: "buildbucket/luci.chromium.try/mac12.0-blink-rel"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/mac12.0.arm64-blink-rel"
+  }
   builders {
     name: "buildbucket/luci.chromium.try/mac_chromium_10.11_rel_ng"
   }
@@ -16214,6 +16220,12 @@ consoles {
   builders {
     name: "buildbucket/luci.chromium.try/mac11.0.arm64-blink-rel"
   }
+  builders {
+    name: "buildbucket/luci.chromium.try/mac12.0-blink-rel"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.try/mac12.0.arm64-blink-rel"
+  }
   builders {
     name: "buildbucket/luci.chromium.try/win10.20h2-blink-rel"
   }

infra/config/subprojects/chromium/try/tryserver.blink.star

@@ -117,3 +117,11 @@ blink_mac_builder(
 blink_mac_builder(
     name = "mac11.0.arm64-blink-rel",
 )
+
+blink_mac_builder(
+    name = "mac12.0-blink-rel",
+)
+
+blink_mac_builder(
+    name = "mac12.0.arm64-blink-rel",
+)

testing/buildbot/chromium.fyi.json

@@ -98445,6 +98445,84 @@
       }
     ]
   },
+  "mac12.0-blink-rel-dummy": {
+    "isolated_scripts": [
+      {
+        "args": [
+          "--num-retries=3",
+          "--git-revision=${got_revision}"
+        ],
+        "isolate_name": "blink_web_tests",
+        "merge": {
+          "args": [
+            "--verbose"
+          ],
+          "script": "//third_party/blink/tools/merge_web_test_results.py"
+        },
+        "name": "blink_web_tests",
+        "precommit_args": [
+          "--gerrit-issue=${patch_issue}",
+          "--gerrit-patchset=${patch_set}",
+          "--buildbucket-id=${buildbucket_build_id}"
+        ],
+        "resultdb": {
+          "enable": true
+        },
+        "results_handler": "layout tests",
+        "swarming": {
+          "can_use_on_swarming_builders": true,
+          "dimension_sets": [
+            {
+              "cpu": "x86-64",
+              "os": "Mac-12"
+            }
+          ],
+          "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
+          "shards": 12
+        },
+        "test_id_prefix": "ninja://:blink_web_tests/"
+      }
+    ]
+  },
+  "mac12.0.arm64-blink-rel-dummy": {
+    "isolated_scripts": [
+      {
+        "args": [
+          "--num-retries=3",
+          "--git-revision=${got_revision}"
+        ],
+        "isolate_name": "blink_web_tests",
+        "merge": {
+          "args": [
+            "--verbose"
+          ],
+          "script": "//third_party/blink/tools/merge_web_test_results.py"
+        },
+        "name": "blink_web_tests",
+        "precommit_args": [
+          "--gerrit-issue=${patch_issue}",
+          "--gerrit-patchset=${patch_set}",
+          "--buildbucket-id=${buildbucket_build_id}"
+        ],
+        "resultdb": {
+          "enable": true
+        },
+        "results_handler": "layout tests",
+        "swarming": {
+          "can_use_on_swarming_builders": true,
+          "dimension_sets": [
+            {
+              "cpu": "arm64",
+              "os": "Mac-12"
+            }
+          ],
+          "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
+          "shards": 12
+        },
+        "test_id_prefix": "ninja://:blink_web_tests/"
+      }
+    ]
+  },
   "win-annotator-rel": {
     "scripts": [
       {

testing/buildbot/generate_buildbot_json.py

@@ -1614,6 +1614,8 @@ class BBJSONGenerator(object):  # pylint: disable=useless-object-inheritance
         'mac10.15-blink-rel-dummy',
         'mac11.0-blink-rel-dummy',
         'mac11.0.arm64-blink-rel-dummy',
+        'mac12.0-blink-rel-dummy',
+        'mac12.0.arm64-blink-rel-dummy',
         'win7-blink-rel-dummy',
         'win10.20h2-blink-rel-dummy',
         'win11-blink-rel-dummy',

testing/buildbot/waterfalls.pyl

@@ -3763,6 +3763,22 @@
           'isolated_scripts': 'chromium_webkit_isolated_scripts',
         },
       },
+      'mac12.0-blink-rel-dummy': {
+        'mixins': [
+          'mac_12_x64',
+        ],
+        'test_suites': {
+          'isolated_scripts': 'chromium_webkit_isolated_scripts',
+        },
+      },
+      'mac12.0.arm64-blink-rel-dummy': {
+        'mixins': [
+          'mac_12_beta_arm64',
+        ],
+        'test_suites': {
+          'isolated_scripts': 'chromium_webkit_isolated_scripts',
+        },
+      },
       'win-annotator-rel': {
         'test_suites': {
           'scripts': 'test_traffic_annotation_auditor_script',

tools/mb/mb_config.pyl

@@ -813,6 +813,8 @@
       'mac10.15-blink-rel': 'release_bot_blink_minimal_symbols_no_nacl',
       'mac11.0-blink-rel': 'release_bot_blink_minimal_symbols_no_nacl',
       'mac11.0.arm64-blink-rel': 'release_bot_blink_arm64_minimal_symbols',
+      'mac12.0-blink-rel': 'release_bot_blink_minimal_symbols_no_nacl',
+      'mac12.0.arm64-blink-rel': 'release_bot_blink_arm64_minimal_symbols',
       'win10.20h2-blink-rel': 'release_bot_blink_x86_minimal_symbols',
       'win11-blink-rel': 'release_bot_blink_x64_minimal_symbols',
       'win7-blink-rel': 'release_bot_blink_x86_minimal_symbols',

tools/mb/mb_config_expectations/tryserver.blink.json

@@ -93,6 +93,30 @@
       "use_goma": true
     }
   },
+  "mac12.0-blink-rel": {
+    "gn_args": {
+      "dcheck_always_on": false,
+      "enable_nacl": false,
+      "ffmpeg_branding": "Chrome",
+      "is_component_build": false,
+      "is_debug": false,
+      "proprietary_codecs": true,
+      "symbol_level": 1,
+      "use_goma": true
+    }
+  },
+  "mac12.0.arm64-blink-rel": {
+    "gn_args": {
+      "dcheck_always_on": false,
+      "ffmpeg_branding": "Chrome",
+      "is_component_build": false,
+      "is_debug": false,
+      "proprietary_codecs": true,
+      "symbol_level": 1,
+      "target_cpu": "arm64",
+      "use_goma": true
+    }
+  },
   "win10.20h2-blink-rel": {
     "gn_args": {
       "dcheck_always_on": false,