Add LUCI and mb configs for CI and trybot "android-11-x86-fyi-rel"
Bug: 1137474
Change-Id: I77a10b8910cb78fc1e20056b938d136a774f1e86
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2500942
Reviewed-by: Yuke Liao <liaoyuke@chromium.org>
Commit-Queue: Haiyang Pan <hypan@google.com>
Cr-Commit-Position: refs/heads/master@{#821386}
diff --git a/infra/config/generated/commit-queue.cfg b/infra/config/generated/commit-queue.cfg
index 4f269fd..465ae205 100644
--- a/infra/config/generated/commit-queue.cfg
+++ b/infra/config/generated/commit-queue.cfg
@@ -196,6 +196,10 @@
includable_only: true
}
builders {
+ name: "chromium/try/android-11-x86-fyi-rel"
+ includable_only: true
+ }
+ builders {
name: "chromium/try/android-asan"
includable_only: true
}
diff --git a/infra/config/generated/cr-buildbucket.cfg b/infra/config/generated/cr-buildbucket.cfg
index 0e8d8aea..0763067 100644
--- a/infra/config/generated/cr-buildbucket.cfg
+++ b/infra/config/generated/cr-buildbucket.cfg
@@ -11384,6 +11384,43 @@
}
}
builders {
+ name: "android-11-x86-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-16.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: "recipes"
+ }
+ 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\"},\"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: 0
+ }
+ experiments {
+ key: "luci.use_realms"
+ value: 100
+ }
+ resultdb {
+ enable: true
+ bq_exports {
+ project: "luci-resultdb"
+ dataset: "chromium"
+ table: "ci_test_results"
+ test_results {}
+ }
+ }
+ }
+ builders {
name: "android-androidx-packager"
swarming_host: "chromium-swarm.appspot.com"
swarming_tags: "vpython:native-python-wrapper"
@@ -19917,6 +19954,51 @@
}
}
builders {
+ name: "android-11-x86-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-16.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: "recipes"
+ }
+ 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\"},\"builder_group\":\"tryserver.chromium.android\",\"recipe\":\"chromium_trybot\"}"
+ execution_timeout_secs: 14400
+ expiration_secs: 7200
+ 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.resultdb.result_sink"
+ value: 0
+ }
+ experiments {
+ key: "luci.use_realms"
+ value: 100
+ }
+ resultdb {
+ enable: true
+ bq_exports {
+ project: "luci-resultdb"
+ dataset: "chromium"
+ table: "try_test_results"
+ test_results {}
+ }
+ }
+ }
+ builders {
name: "android-asan"
swarming_host: "chromium-swarm.appspot.com"
swarming_tags: "vpython:native-python-wrapper"
diff --git a/infra/config/generated/luci-milo.cfg b/infra/config/generated/luci-milo.cfg
index fb23151..65a992b 100644
--- a/infra/config/generated/luci-milo.cfg
+++ b/infra/config/generated/luci-milo.cfg
@@ -3087,6 +3087,11 @@
short_name: "P-IFT"
}
builders {
+ name: "buildbucket/luci.chromium.ci/android-11-x86-fyi-rel"
+ category: "emulator|11|x86"
+ short_name: "rel"
+ }
+ builders {
name: "buildbucket/luci.chromium.ci/android-pie-x86-fyi-rel"
category: "emulator|P|x86"
short_name: "rel"
@@ -11000,6 +11005,9 @@
name: "buildbucket/luci.chromium.try/android-10-arm64-rel"
}
builders {
+ name: "buildbucket/luci.chromium.try/android-11-x86-fyi-rel"
+ }
+ builders {
name: "buildbucket/luci.chromium.try/android-asan"
}
builders {
@@ -11916,6 +11924,9 @@
name: "buildbucket/luci.chromium.try/android-10-arm64-rel"
}
builders {
+ name: "buildbucket/luci.chromium.try/android-11-x86-fyi-rel"
+ }
+ builders {
name: "buildbucket/luci.chromium.try/android-asan"
}
builders {
diff --git a/infra/config/generated/luci-scheduler.cfg b/infra/config/generated/luci-scheduler.cfg
index 66c1e14..48b81378 100644
--- a/infra/config/generated/luci-scheduler.cfg
+++ b/infra/config/generated/luci-scheduler.cfg
@@ -4141,6 +4141,16 @@
}
}
job {
+ id: "android-11-x86-fyi-rel"
+ realm: "ci"
+ acl_sets: "ci"
+ buildbucket {
+ server: "cr-buildbucket.appspot.com"
+ bucket: "luci.chromium.ci"
+ builder: "android-11-x86-fyi-rel"
+ }
+}
+job {
id: "android-androidx-packager"
realm: "ci"
schedule: "0 7,14,22 * * * *"
@@ -6382,6 +6392,7 @@
triggers: "Win10 FYI x64 SkiaRenderer Dawn Release (NVIDIA)"
triggers: "Windows deterministic"
triggers: "android-10-arm64-rel"
+ triggers: "android-11-x86-fyi-rel"
triggers: "android-archive-dbg"
triggers: "android-archive-rel"
triggers: "android-arm64-proguard-rel"
diff --git a/infra/config/subprojects/chromium/ci.star b/infra/config/subprojects/chromium/ci.star
index 73664ee..612a6e8f 100644
--- a/infra/config/subprojects/chromium/ci.star
+++ b/infra/config/subprojects/chromium/ci.star
@@ -1018,6 +1018,14 @@
schedule = "triggered", # triggered manually via Scheduler UI
)
+ci.android_fyi_builder(
+ name = "android-11-x86-fyi-rel",
+ console_view_entry = ci.console_view_entry(
+ category = "emulator|11|x86",
+ short_name = "rel",
+ ),
+)
+
ci.chromium_builder(
name = "android-archive-dbg",
# Bump to 32 if needed.
diff --git a/infra/config/subprojects/chromium/try.star b/infra/config/subprojects/chromium/try.star
index 8ddbce7..9560696 100644
--- a/infra/config/subprojects/chromium/try.star
+++ b/infra/config/subprojects/chromium/try.star
@@ -248,6 +248,10 @@
)
try_.chromium_android_builder(
+ name = "android-11-x86-fyi-rel",
+)
+
+try_.chromium_android_builder(
name = "android-asan",
)
diff --git a/tools/mb/mb_config.pyl b/tools/mb/mb_config.pyl
index 0d3a0ca..3b21695 100644
--- a/tools/mb/mb_config.pyl
+++ b/tools/mb/mb_config.pyl
@@ -126,6 +126,7 @@
'chromium.android.fyi': {
'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-inverse-fieldtrials-pie-x86-fyi-rel': 'android_release_bot_minimal_symbols_x86_fastbuild_webview_google_invert_fieldtrials',
'android-pie-arm64-wpt-rel-non-cq': 'android_release_bot_minimal_symbols_arm64_webview_google',
'android-weblayer-x86-fyi-rel': 'android_release_bot_minimal_symbols_x86_fastbuild_webview_google',
@@ -769,6 +770,7 @@
'android-weblayer-pie-x86-fyi-rel': 'android_release_trybot_x86_fastbuild_webview_google',
'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-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',
diff --git a/tools/mb/mb_config_expectations/chromium.android.fyi.json b/tools/mb/mb_config_expectations/chromium.android.fyi.json
index 4dfff764..368d264 100644
--- a/tools/mb/mb_config_expectations/chromium.android.fyi.json
+++ b/tools/mb/mb_config_expectations/chromium.android.fyi.json
@@ -13,6 +13,22 @@
"use_goma": true
}
},
+ "android-11-x86-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": "x86",
+ "target_os": "android",
+ "use_errorprone_java_compiler": false,
+ "use_goma": true
+ }
+ },
"android-inverse-fieldtrials-pie-x86-fyi-rel": {
"gn_args": {
"disable_android_lint": true,
diff --git a/tools/mb/mb_config_expectations/tryserver.chromium.android.json b/tools/mb/mb_config_expectations/tryserver.chromium.android.json
index 53be7206..70552591 100644
--- a/tools/mb/mb_config_expectations/tryserver.chromium.android.json
+++ b/tools/mb/mb_config_expectations/tryserver.chromium.android.json
@@ -16,6 +16,23 @@
"use_goma": true
}
},
+ "android-11-x86-fyi-rel": {
+ "gn_args": {
+ "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": "x86",
+ "target_os": "android",
+ "use_errorprone_java_compiler": false,
+ "use_goma": true
+ }
+ },
"android-asan": {
"gn_args": {
"dcheck_always_on": true,