Add luci & mb configs for android-12-x64-fyi-rel on CI and try

The builders will run on android emulator with Android 12 preview system
images on x86_64.

Bug: 1225851
Change-Id: Ib9d58cbcfcb294a6c0cb4cd71a83828793ed877f
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3000733
Commit-Queue: Haiyang Pan <hypan@google.com>
Reviewed-by: Yuke Liao <liaoyuke@chromium.org>
Cr-Commit-Position: refs/heads/master@{#899770}

infra/config/generated/commit-queue.cfg

@@ -181,6 +181,10 @@ config_groups {
         name: "chromium/try/android-11-x86-fyi-rel"
         includable_only: true
       }
+      builders {
+        name: "chromium/try/android-12-x64-fyi-rel"
+        includable_only: true
+      }
       builders {
         name: "chromium/try/android-angle-chromium-try"
         includable_only: true

infra/config/generated/cr-buildbucket.cfg

@@ -20181,6 +20181,74 @@ buckets {
         }
       }
     }
+    builders {
+      name: "android-12-x64-fyi-rel"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-18.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      exe {
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        cmd: "luciexe"
+      }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/resultdb/test_presentation\":{\"column_keys\":[],\"grouping_keys\":[\"status\",\"v.test_suite\"]},\"builder_group\":\"chromium.android.fyi\",\"recipe\":\"chromium\"}"
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      experiments {
+        key: "chromium.resultdb.result_sink"
+        value: 100
+      }
+      experiments {
+        key: "chromium.resultdb.result_sink.gtests_local"
+        value: 100
+      }
+      experiments {
+        key: "chromium.resultdb.result_sink.junit_tests"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "gpu_ci_test_results"
+          test_results {
+            predicate {
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)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/.+"
+            }
+          }
+        }
+        history_options {
+          use_invocation_timestamp: true
+        }
+      }
+    }
     builders {
       name: "android-androidx-packager"
       swarming_host: "chromium-swarm.appspot.com"
@@ -38619,6 +38687,85 @@ buckets {
         }
       }
     }
+    builders {
+      name: "android-12-x64-fyi-rel"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-18.04"
+      dimensions: "pool:luci.chromium.try"
+      dimensions: "ssd:0"
+      exe {
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        cmd: "luciexe"
+      }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"$recipe_engine/resultdb/test_presentation\":{\"column_keys\":[],\"grouping_keys\":[\"status\",\"v.test_suite\"]},\"builder_group\":\"tryserver.chromium.android\",\"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: "chromium.chromium_tests.use_rbe_cas"
+        value: 5
+      }
+      experiments {
+        key: "chromium.resultdb.result_sink"
+        value: 100
+      }
+      experiments {
+        key: "chromium.resultdb.result_sink.junit_tests"
+        value: 100
+      }
+      experiments {
+        key: "luci.use_realms"
+        value: 100
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "try_test_results"
+          test_results {}
+        }
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "gpu_try_test_results"
+          test_results {
+            predicate {
+              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)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: "android-angle-chromium-try"
       swarming_host: "chromium-swarm.appspot.com"

infra/config/generated/luci-milo.cfg

@@ -3482,6 +3482,11 @@ consoles {
     category: "emulator|11|x86"
     short_name: "rel"
   }
+  builders {
+    name: "buildbucket/luci.chromium.ci/android-12-x64-fyi-rel"
+    category: "emulator|12|x64"
+    short_name: "rel"
+  }
   builders {
     name: "buildbucket/luci.chromium.ci/android-pie-x86-fyi-rel"
     category: "emulator|P|x86"
@@ -13447,6 +13452,9 @@ consoles {
   builders {
     name: "buildbucket/luci.chromium.try/android-11-x86-fyi-rel"
   }
+  builders {
+    name: "buildbucket/luci.chromium.try/android-12-x64-fyi-rel"
+  }
   builders {
     name: "buildbucket/luci.chromium.try/android-angle-chromium-try"
   }
@@ -14492,6 +14500,9 @@ consoles {
   builders {
     name: "buildbucket/luci.chromium.try/android-11-x86-fyi-rel"
   }
+  builders {
+    name: "buildbucket/luci.chromium.try/android-12-x64-fyi-rel"
+  }
   builders {
     name: "buildbucket/luci.chromium.try/android-asan"
   }

infra/config/generated/luci-scheduler.cfg

@@ -4227,6 +4227,16 @@ job {
     builder: "android-11-x86-fyi-rel"
   }
 }
+job {
+  id: "android-12-x64-fyi-rel"
+  realm: "ci"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "android-12-x64-fyi-rel"
+  }
+}
 job {
   id: "android-androidx-packager"
   realm: "ci"
@@ -7203,6 +7213,7 @@ trigger {
   triggers: "Windows deterministic"
   triggers: "android-10-arm64-rel"
   triggers: "android-11-x86-fyi-rel"
+  triggers: "android-12-x64-fyi-rel"
   triggers: "android-angle-arm64-builder"
   triggers: "android-angle-chromium-arm64-builder"
   triggers: "android-archive-dbg"

infra/config/subprojects/chromium/ci.star

@@ -1150,6 +1150,15 @@ ci.android_fyi_builder(
     os = os.LINUX_BIONIC_REMOVE,
 )
 
+ci.android_fyi_builder(
+    name = "android-12-x64-fyi-rel",
+    console_view_entry = consoles.console_view_entry(
+        category = "emulator|12|x64",
+        short_name = "rel",
+    ),
+    os = os.LINUX_BIONIC_REMOVE,
+)
+
 ci.angle_linux_builder(
     name = "android-angle-arm64-builder",
     console_view_entry = consoles.console_view_entry(

infra/config/subprojects/chromium/try.star

@@ -292,6 +292,10 @@ try_.chromium_android_builder(
     name = "android-11-x86-fyi-rel",
 )
 
+try_.chromium_android_builder(
+    name = "android-12-x64-fyi-rel",
+)
+
 try_.chromium_android_builder(
     name = "android-asan",
 )

tools/mb/mb_config.pyl

@@ -111,6 +111,7 @@
       'Android arm64 Builder (dbg) (reclient)': 'android_webview_google_debug_static_bot_arm64_reclient',
       'Android WebView P FYI (rel)': 'android_release_bot_minimal_symbols_arm64_webview_google',
       'android-11-x86-fyi-rel': 'android_release_bot_minimal_symbols_x86_fastbuild_webview_google',
+      'android-12-x64-fyi-rel': 'android_release_bot_minimal_symbols_x64_fastbuild_webview_google',
       'android-pie-arm64-wpt-rel-non-cq': 'android_release_bot_minimal_symbols_arm64_webview_google',
       'android-web-platform-pie-x86-fyi-rel': 'android_release_bot_minimal_symbols_x86_fastbuild_webview_google',
       'android-weblayer-pie-x86-wpt-fyi-rel': 'android_release_bot_minimal_symbols_x86_fastbuild_webview_google',
@@ -816,6 +817,7 @@
       'android-webview-pie-arm64-fyi-rel': 'android_release_trybot_arm64_webview_google',
       'android-10-arm64-rel': 'android_release_trybot_arm64_fastbuild_webview_google',
       'android-11-x86-fyi-rel': 'android_release_trybot_x86_fastbuild_webview_google',
+      'android-12-x64-fyi-rel': 'android_release_trybot_x64_fastbuild_webview_google',
       'android-webview-marshmallow-arm64-dbg': 'android_release_trybot_arm64_webview_google',
       'android-webview-nougat-arm64-dbg': 'android_release_trybot_arm64_webview_google',
       'android-webview-oreo-arm64-dbg': 'android_release_trybot_arm64_webview_google',
@@ -1439,6 +1441,11 @@
       'webview_google',
     ],
 
+    'android_release_bot_minimal_symbols_x64_fastbuild_webview_google': [
+      'android', 'release_bot', 'minimal_symbols', 'x64',
+      'strip_debug_info', 'android_fastbuild', 'webview_google',
+    ],
+
     'android_release_bot_minimal_symbols_x86_fastbuild_resource_allowlisting_disable_proguard_chrome_google': [
       'android', 'release_bot', 'minimal_symbols',
       'android_fastbuild', 'x86', 'resource_allowlisting', 'disable_proguard',
@@ -1521,6 +1528,11 @@
       'chrome_google'
     ],
 
+    'android_release_trybot_x64_fastbuild_webview_google': [
+      'android', 'release_trybot', 'strip_debug_info', 'x64',
+      'android_fastbuild', 'webview_google',
+    ],
+
     'android_release_trybot_x86_fastbuild_resource_allowlisting_webview_google': [
       'android', 'release_trybot', 'x86', 'android_fastbuild',
       'resource_allowlisting', 'webview_google',

tools/mb/mb_config_expectations/chromium.android.fyi.json

@@ -56,6 +56,22 @@
       "use_goma": true
     }
   },
+  "android-12-x64-fyi-rel": {
+    "gn_args": {
+      "disable_android_lint": true,
+      "ffmpeg_branding": "Chrome",
+      "is_component_build": false,
+      "is_debug": false,
+      "proprietary_codecs": true,
+      "strip_debug_info": true,
+      "symbol_level": 1,
+      "system_webview_package_name": "com.google.android.webview",
+      "target_cpu": "x64",
+      "target_os": "android",
+      "use_errorprone_java_compiler": false,
+      "use_goma": true
+    }
+  },
   "android-pie-arm64-wpt-rel-non-cq": {
     "gn_args": {
       "ffmpeg_branding": "Chrome",

tools/mb/mb_config_expectations/tryserver.chromium.android.json

@@ -35,6 +35,24 @@
       "use_goma": true
     }
   },
+  "android-12-x64-fyi-rel": {
+    "gn_args": {
+      "blink_enable_generated_code_formatting": false,
+      "dcheck_always_on": true,
+      "disable_android_lint": true,
+      "ffmpeg_branding": "Chrome",
+      "is_component_build": false,
+      "is_debug": false,
+      "proprietary_codecs": true,
+      "strip_debug_info": true,
+      "symbol_level": 1,
+      "system_webview_package_name": "com.google.android.webview",
+      "target_cpu": "x64",
+      "target_os": "android",
+      "use_errorprone_java_compiler": false,
+      "use_goma": true
+    }
+  },
   "android-asan": {
     "gn_args": {
       "blink_enable_generated_code_formatting": false,