Add builder for Win11 bots in UAC pool.

1) Modify `waterfalls.pyl`.
2) Run `vpython3 .\testing\buildbot\generate_buildbot_json.py` to
re-generate `chromium.updater.json`.
3) Modify `chromium.updater.star` to add the builder. Run
`lucicfg fmt .\infra\config\subprojects\chromium\ci\chromium.updater.star` if
necessary.
4) Run `lucicfg infra\config\main.star`.

Bug: 1225352
Change-Id: I2eddb6831ef3e5fb7a682e7142ed6cdcea94a61d
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3864352
Reviewed-by: Hans Wennborg <hans@chromium.org>
Reviewed-by: Joshua Pawlicki <waffles@chromium.org>
Commit-Queue: Xiaoling Bao <xiaolingbao@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1042260}

docs/updater/dev_manual.md

@@ -11,14 +11,27 @@ including tips and tricks.
 quickly.
 ### Adding Builders
 * Update files as needed:
-  * `testing/buildbot/chromium.updater.json`
-  * `testing/buildbot/waterfalls.pyl`
-  * `infra/config/subprojects/chromium/ci/chromium.updater.star`
-* Run the following command to generate LUCI config files:
-    ```
-    lucicfg infra\config\main.star
-    ```
-* Reference CL: https://crrev.com/c/3472270
+  - `testing/buildbot/waterfalls.pyl`
+  - `infra/config/subprojects/chromium/ci/chromium.updater.star`
+* Re-generate `chromium.updater.json`:
+```
+vpython3 .\testing\buildbot\generate_buildbot_json.py
+```
+
+* (Optional) Re-format the builder definition file if necessary.
+```
+lucicfg fmt .\infra\config\subprojects\chromium\ci\chromium.updater.star
+```
+
+* Generate builder property and configuration files:
+
+```
+lucicfg infra\config\main.star
+git add .
+```
+
+* Reference CL: https://crrev.com/c/3864352
+
 ### Update builder configuration
 Each builder has a configuration that governs the GN args. The mapping is
 defined in file `tools/mb/mb_config.pyl`. Steps to update the config:

infra/config/generated/builders/ci/win-updater-builder-dbg/properties.json

@@ -81,6 +81,34 @@
                 "project": "chromium"
               }
             }
+          },
+          {
+            "builder_id": {
+              "bucket": "ci",
+              "builder": "win11-updater-tester-dbg-uac",
+              "project": "chromium"
+            },
+            "builder_spec": {
+              "builder_group": "chromium.updater",
+              "execution_mode": "TEST",
+              "legacy_chromium_config": {
+                "apply_configs": [
+                  "mb"
+                ],
+                "build_config": "Release",
+                "config": "chromium",
+                "target_bits": 64,
+                "target_platform": "win"
+              },
+              "legacy_gclient_config": {
+                "config": "chromium"
+              },
+              "parent": {
+                "bucket": "ci",
+                "builder": "win-updater-builder-dbg",
+                "project": "chromium"
+              }
+            }
           }
         ]
       },
@@ -101,6 +129,11 @@
           "bucket": "ci",
           "builder": "win10-updater-tester-dbg-uac",
           "project": "chromium"
+        },
+        {
+          "bucket": "ci",
+          "builder": "win11-updater-tester-dbg-uac",
+          "project": "chromium"
         }
       ],
       "mirroring_builder_group_and_names": [

infra/config/generated/builders/ci/win11-updater-tester-dbg-uac/properties.json

@@ -0,0 +1,77 @@
+{
+  "$build/chromium_tests_builder_config": {
+    "builder_config": {
+      "builder_db": {
+        "entries": [
+          {
+            "builder_id": {
+              "bucket": "ci",
+              "builder": "win-updater-builder-dbg",
+              "project": "chromium"
+            },
+            "builder_spec": {
+              "builder_group": "chromium.updater",
+              "execution_mode": "COMPILE_AND_TEST",
+              "legacy_chromium_config": {
+                "apply_configs": [
+                  "mb"
+                ],
+                "build_config": "Release",
+                "config": "chromium",
+                "target_bits": 64,
+                "target_platform": "win"
+              },
+              "legacy_gclient_config": {
+                "config": "chromium"
+              }
+            }
+          },
+          {
+            "builder_id": {
+              "bucket": "ci",
+              "builder": "win11-updater-tester-dbg-uac",
+              "project": "chromium"
+            },
+            "builder_spec": {
+              "builder_group": "chromium.updater",
+              "execution_mode": "TEST",
+              "legacy_chromium_config": {
+                "apply_configs": [
+                  "mb"
+                ],
+                "build_config": "Release",
+                "config": "chromium",
+                "target_bits": 64,
+                "target_platform": "win"
+              },
+              "legacy_gclient_config": {
+                "config": "chromium"
+              },
+              "parent": {
+                "bucket": "ci",
+                "builder": "win-updater-builder-dbg",
+                "project": "chromium"
+              }
+            }
+          }
+        ]
+      },
+      "builder_ids": [
+        {
+          "bucket": "ci",
+          "builder": "win11-updater-tester-dbg-uac",
+          "project": "chromium"
+        }
+      ]
+    }
+  },
+  "$recipe_engine/resultdb/test_presentation": {
+    "column_keys": [],
+    "grouping_keys": [
+      "status",
+      "v.test_suite"
+    ]
+  },
+  "builder_group": "chromium.updater",
+  "recipe": "chromium"
+}

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

@@ -44157,6 +44157,86 @@ buckets {
         }
       }
     }
+    builders {
+      name: "win11-updater-tester-dbg-uac"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "free_space:standard"
+      dimensions: "os:Ubuntu-18.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      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/ci/win11-updater-tester-dbg-uac/properties.json",'
+        '    "top_level_project": {'
+        '      "ref": "refs/heads/main",'
+        '      "repo": {'
+        '        "host": "chromium.googlesource.com",'
+        '        "project": "chromium/src"'
+        '      }'
+        '    }'
+        '  },'
+        '  "builder_group": "chromium.updater",'
+        '  "led_builder_is_bootstrapped": true,'
+        '  "recipe": "chromium"'
+        '}'
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "chrome-luci-data"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+        bq_exports {
+          project: "chrome-luci-data"
+          dataset: "chromium"
+          table: "gpu_ci_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_ci_test_results"
+          test_results {
+            predicate {
+              test_id_regexp: "(ninja://[^/]*blink_web_tests/.+)|(ninja://[^/]*blink_wpt_tests/.+)"
+            }
+          }
+        }
+        history_options {
+          use_invocation_timestamp: true
+        }
+      }
+    }
     builders {
       name: "win32-archive-dbg"
       swarming_host: "chromium-swarm.appspot.com"

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

@@ -13576,6 +13576,11 @@ consoles {
     category: "debug|win (64)"
     short_name: "UAC10"
   }
+  builders {
+    name: "buildbucket/luci.chromium.ci/win11-updater-tester-dbg-uac"
+    category: "debug|win (64)"
+    short_name: "UAC11"
+  }
   builders {
     name: "buildbucket/luci.chromium.ci/win-updater-builder-dbg"
     category: "debug|win (64)"

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

@@ -7173,6 +7173,20 @@ job {
     builder: "win10-updater-tester-rel"
   }
 }
+job {
+  id: "win11-updater-tester-dbg-uac"
+  realm: "ci"
+  acls {
+    role: TRIGGERER
+    granted_to: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+  }
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "ci"
+    builder: "win11-updater-tester-dbg-uac"
+  }
+}
 job {
   id: "win32-archive-dbg"
   realm: "ci"

infra/config/generated/luci/realms.cfg

@@ -200,6 +200,7 @@ realms {
         values: "win10-updater-tester-dbg"
         values: "win10-updater-tester-dbg-uac"
         values: "win10-updater-tester-rel"
+        values: "win11-updater-tester-dbg-uac"
         values: "win7(32)-updater-tester-rel"
         values: "win7-updater-tester-rel"
       }

infra/config/subprojects/chromium/ci/chromium.updater.star

@@ -633,3 +633,27 @@ ci.thin_tester(
     ),
     triggered_by = ["win-updater-builder-rel"],
 )
+
+ci.thin_tester(
+    name = "win11-updater-tester-dbg-uac",
+    builder_spec = builder_config.builder_spec(
+        execution_mode = builder_config.execution_mode.TEST,
+        gclient_config = builder_config.gclient_config(
+            config = "chromium",
+        ),
+        chromium_config = builder_config.chromium_config(
+            config = "chromium",
+            apply_configs = [
+                "mb",
+            ],
+            build_config = builder_config.build_config.RELEASE,
+            target_bits = 64,
+            target_platform = builder_config.target_platform.WIN,
+        ),
+    ),
+    console_view_entry = consoles.console_view_entry(
+        category = "debug|win (64)",
+        short_name = "UAC11",
+    ),
+    triggered_by = ["win-updater-builder-dbg"],
+)

testing/buildbot/chromium.updater.json

@@ -736,6 +736,59 @@
       }
     ]
   },
+  "win11-updater-tester-dbg-uac": {
+    "gtest_tests": [
+      {
+        "args": [
+          "--test-launcher-timeout=90000",
+          "--ui-test-action-max-timeout=45000",
+          "--ui-test-action-timeout=40000"
+        ],
+        "merge": {
+          "args": [],
+          "script": "//testing/merge_scripts/standard_gtest_merge.py"
+        },
+        "swarming": {
+          "can_use_on_swarming_builders": true,
+          "dimension_sets": [
+            {
+              "cpu": "x86-64",
+              "integrity": "high",
+              "os": "Windows-11-22000",
+              "pool": "chromium.win.uac"
+            }
+          ],
+          "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
+        },
+        "test": "updater_tests_system",
+        "test_id_prefix": "ninja://chrome/updater:updater_tests_system/"
+      },
+      {
+        "args": [
+          "--test-launcher-timeout=90000",
+          "--ui-test-action-max-timeout=45000",
+          "--ui-test-action-timeout=40000"
+        ],
+        "merge": {
+          "args": [],
+          "script": "//testing/merge_scripts/standard_gtest_merge.py"
+        },
+        "swarming": {
+          "can_use_on_swarming_builders": true,
+          "dimension_sets": [
+            {
+              "cpu": "x86-64",
+              "os": "Windows-11-22000",
+              "pool": "chromium.win.uac"
+            }
+          ],
+          "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
+        },
+        "test": "updater_tests_win_uac",
+        "test_id_prefix": "ninja://chrome/updater:updater_tests_win_uac/"
+      }
+    ]
+  },
   "win7(32)-updater-tester-rel": {
     "gtest_tests": [
       {

testing/buildbot/waterfalls.pyl

@@ -6043,6 +6043,22 @@
           ]
         },
       },
+      'win11-updater-tester-dbg-uac': {
+        'mixins': [
+          'win11',
+          'x86-64',
+        ],
+        'test_suites': {
+          'gtest_tests': 'updater_gtests_win_uac',
+        },
+        'swarming': {
+          'dimension_sets': [
+            {
+              'pool': 'chromium.win.uac',
+            }
+          ]
+        },
+      },
       'win7(32)-updater-tester-rel': {
         'mixins': [
           'win7',