Enable gardening for builder "android-angle-chromium-arm64-pixel2"
Also remove the builder "android-angle-chromium-arm64-nexus5x" since
the test suites run fine on Pixel 2 now.
Bug: 355671260
Change-Id: I176bfa2a301554eab9d3b9122aadbb0048ea235a
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5811901
Reviewed-by: Yuly Novikov <ynovikov@chromium.org>
Commit-Queue: Yuly Novikov <ynovikov@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1347338}
diff --git a/content/test/gpu/gpu_tests/test_expectations/webgl_conformance_expectations.txt b/content/test/gpu/gpu_tests/test_expectations/webgl_conformance_expectations.txt
index 30c4d4e..2de3db1e 100644
--- a/content/test/gpu/gpu_tests/test_expectations/webgl_conformance_expectations.txt
+++ b/content/test/gpu/gpu_tests/test_expectations/webgl_conformance_expectations.txt
@@ -628,8 +628,6 @@
# flaky (2018-09-10) that it had to be upgraded to Fail.
crbug.com/951628 [ android android-nexus-5x no-passthrough ] conformance/rendering/blending.html [ Failure ]
crbug.com/1056830 [ android android-nexus-5x ] conformance/extensions/webgl-compressed-texture-astc.html [ Failure ]
-# Timing out on this device for unknown reasons.
-crbug.com/1122644 [ android android-nexus-5x angle-opengles passthrough ] conformance/textures/misc/texture-upload-size.html [ Failure ]
# Fails on android oreo
crbug.com/1470373 [ android-oreo android-nexus-5x passthrough ] conformance/textures/misc/video-rotation.html [ Failure ]
diff --git a/infra/config/generated/builder-owners/angle-team@google.com.txt b/infra/config/generated/builder-owners/angle-team@google.com.txt
index 17f661d2..ad958d3 100644
--- a/infra/config/generated/builder-owners/angle-team@google.com.txt
+++ b/infra/config/generated/builder-owners/angle-team@google.com.txt
@@ -1,5 +1,4 @@
ci/android-angle-chromium-arm64-builder
-ci/android-angle-chromium-arm64-nexus5x
ci/android-angle-chromium-arm64-pixel2
ci/fuchsia-angle-builder
ci/ios-angle-builder
diff --git a/infra/config/generated/health-specs/health-specs.json b/infra/config/generated/health-specs/health-specs.json
index 85e4db5..d1b83dc5 100644
--- a/infra/config/generated/health-specs/health-specs.json
+++ b/infra/config/generated/health-specs/health-specs.json
@@ -6807,27 +6807,6 @@
}
]
},
- "android-angle-chromium-arm64-nexus5x": {
- "contact_team_email": "angle-team@google.com",
- "problem_specs": [
- {
- "name": "Unhealthy",
- "period_days": 7,
- "score": 5,
- "thresholds": {
- "_default": "_default"
- }
- },
- {
- "name": "Low Value",
- "period_days": 90,
- "score": 1,
- "thresholds": {
- "_default": "_default"
- }
- }
- ]
- },
"android-angle-chromium-arm64-pixel2": {
"contact_team_email": "angle-team@google.com",
"problem_specs": [
diff --git a/infra/config/generated/luci/cr-buildbucket.cfg b/infra/config/generated/luci/cr-buildbucket.cfg
index 250684f..820c3eaf 100644
--- a/infra/config/generated/luci/cr-buildbucket.cfg
+++ b/infra/config/generated/luci/cr-buildbucket.cfg
@@ -33209,40 +33209,6 @@
' {'
' "builder_id": {'
' "bucket": "ci",'
- ' "builder": "android-angle-chromium-arm64-nexus5x",'
- ' "project": "chromium"'
- ' },'
- ' "builder_spec": {'
- ' "build_gs_bucket": "chromium-angle-archive",'
- ' "builder_group": "chromium.angle",'
- ' "execution_mode": "TEST",'
- ' "legacy_android_config": {'
- ' "config": "main_builder_mb"'
- ' },'
- ' "legacy_chromium_config": {'
- ' "build_config": "Release",'
- ' "config": "android",'
- ' "target_bits": 64,'
- ' "target_platform": "android"'
- ' },'
- ' "legacy_gclient_config": {'
- ' "apply_configs": ['
- ' "android",'
- ' "angle_top_of_tree"'
- ' ],'
- ' "config": "chromium"'
- ' },'
- ' "parent": {'
- ' "bucket": "ci",'
- ' "builder": "android-angle-chromium-arm64-builder",'
- ' "project": "chromium"'
- ' },'
- ' "run_tests_serially": true'
- ' }'
- ' },'
- ' {'
- ' "builder_id": {'
- ' "bucket": "ci",'
' "builder": "android-angle-chromium-arm64-pixel2",'
' "project": "chromium"'
' },'
@@ -33286,11 +33252,6 @@
' "builder_ids_in_scope_for_testing": ['
' {'
' "bucket": "ci",'
- ' "builder": "android-angle-chromium-arm64-nexus5x",'
- ' "project": "chromium"'
- ' },'
- ' {'
- ' "bucket": "ci",'
' "builder": "android-angle-chromium-arm64-pixel2",'
' "project": "chromium"'
' }'
@@ -33406,175 +33367,6 @@
contact_team_email: "angle-team@google.com"
}
builders {
- name: "android-angle-chromium-arm64-nexus5x"
- swarming_host: "chromium-swarm.appspot.com"
- dimensions: "builderless:1"
- dimensions: "cores:2"
- dimensions: "cpu:x86-64"
- dimensions: "free_space:standard"
- dimensions: "os:Ubuntu-22.04"
- dimensions: "pool:luci.chromium.gpu.ci"
- dimensions: "ssd:0"
- exe {
- cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
- cipd_version: "refs/heads/main"
- cmd: "luciexe"
- }
- properties:
- '{'
- ' "$build/chromium_tests_builder_config": {'
- ' "builder_config": {'
- ' "builder_db": {'
- ' "entries": ['
- ' {'
- ' "builder_id": {'
- ' "bucket": "ci",'
- ' "builder": "android-angle-chromium-arm64-builder",'
- ' "project": "chromium"'
- ' },'
- ' "builder_spec": {'
- ' "build_gs_bucket": "chromium-angle-archive",'
- ' "builder_group": "chromium.angle",'
- ' "execution_mode": "COMPILE_AND_TEST",'
- ' "legacy_android_config": {'
- ' "config": "main_builder_mb"'
- ' },'
- ' "legacy_chromium_config": {'
- ' "build_config": "Release",'
- ' "config": "android",'
- ' "target_bits": 64,'
- ' "target_platform": "android"'
- ' },'
- ' "legacy_gclient_config": {'
- ' "apply_configs": ['
- ' "android",'
- ' "angle_top_of_tree"'
- ' ],'
- ' "config": "chromium"'
- ' }'
- ' }'
- ' },'
- ' {'
- ' "builder_id": {'
- ' "bucket": "ci",'
- ' "builder": "android-angle-chromium-arm64-nexus5x",'
- ' "project": "chromium"'
- ' },'
- ' "builder_spec": {'
- ' "build_gs_bucket": "chromium-angle-archive",'
- ' "builder_group": "chromium.angle",'
- ' "execution_mode": "TEST",'
- ' "legacy_android_config": {'
- ' "config": "main_builder_mb"'
- ' },'
- ' "legacy_chromium_config": {'
- ' "build_config": "Release",'
- ' "config": "android",'
- ' "target_bits": 64,'
- ' "target_platform": "android"'
- ' },'
- ' "legacy_gclient_config": {'
- ' "apply_configs": ['
- ' "android",'
- ' "angle_top_of_tree"'
- ' ],'
- ' "config": "chromium"'
- ' },'
- ' "parent": {'
- ' "bucket": "ci",'
- ' "builder": "android-angle-chromium-arm64-builder",'
- ' "project": "chromium"'
- ' },'
- ' "run_tests_serially": true'
- ' }'
- ' }'
- ' ]'
- ' },'
- ' "builder_ids": ['
- ' {'
- ' "bucket": "ci",'
- ' "builder": "android-angle-chromium-arm64-nexus5x",'
- ' "project": "chromium"'
- ' }'
- ' ],'
- ' "mirroring_builder_group_and_names": ['
- ' {'
- ' "builder": "android-angle-chromium-try",'
- ' "group": "tryserver.chromium.angle"'
- ' }'
- ' ]'
- ' }'
- ' },'
- ' "$recipe_engine/resultdb/test_presentation": {'
- ' "column_keys": [],'
- ' "grouping_keys": ['
- ' "status",'
- ' "v.test_suite"'
- ' ]'
- ' },'
- ' "builder_group": "chromium.angle",'
- ' "gardener_rotations": ['
- ' "angle"'
- ' ],'
- ' "perf_dashboard_machine_group": "ChromiumANGLE",'
- ' "recipe": "angle_chromium",'
- ' "sheriff_rotations": ['
- ' "angle"'
- ' ]'
- '}'
- execution_timeout_secs: 10800
- build_numbers: YES
- service_account: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
- experiments {
- key: "chromium_swarming.expose_merge_script_failures"
- value: 100
- }
- 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|content)/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://[^/]*_wpt_tests/.+)"
- }
- }
- }
- history_options {
- use_invocation_timestamp: true
- }
- }
- description_html: "This builder is mirrored by any of the following try builders:<br/><ul><li><a href=\"https://ci.chromium.org/p/chromium/builders/try/android-angle-chromium-try\">android-angle-chromium-try</a></li></ul>"
- shadow_builder_adjustments {
- service_account: "chromium-try-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
- pool: "luci.chromium.try"
- dimensions: "free_space:"
- dimensions: "pool:luci.chromium.try"
- }
- contact_team_email: "angle-team@google.com"
- }
- builders {
name: "android-angle-chromium-arm64-pixel2"
swarming_host: "chromium-swarm.appspot.com"
dimensions: "builderless:1"
@@ -33665,6 +33457,12 @@
' "builder": "android-angle-chromium-arm64-pixel2",'
' "project": "chromium"'
' }'
+ ' ],'
+ ' "mirroring_builder_group_and_names": ['
+ ' {'
+ ' "builder": "android-angle-chromium-try",'
+ ' "group": "tryserver.chromium.angle"'
+ ' }'
' ]'
' }'
' },'
@@ -33676,8 +33474,14 @@
' ]'
' },'
' "builder_group": "chromium.angle",'
+ ' "gardener_rotations": ['
+ ' "angle"'
+ ' ],'
' "perf_dashboard_machine_group": "ChromiumANGLE",'
- ' "recipe": "angle_chromium"'
+ ' "recipe": "angle_chromium",'
+ ' "sheriff_rotations": ['
+ ' "angle"'
+ ' ]'
'}'
execution_timeout_secs: 10800
build_numbers: YES
@@ -33722,7 +33526,7 @@
use_invocation_timestamp: true
}
}
- description_html: "Running Angle chromium tests on Pixel 2"
+ description_html: "Running Angle chromium tests on Pixel 2<br/>This builder is mirrored by any of the following try builders:<br/><ul><li><a href=\"https://ci.chromium.org/p/chromium/builders/try/android-angle-chromium-try\">android-angle-chromium-try</a></li></ul>"
shadow_builder_adjustments {
service_account: "chromium-try-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
pool: "luci.chromium.try"
@@ -68575,7 +68379,7 @@
' {'
' "builder_id": {'
' "bucket": "ci",'
- ' "builder": "android-angle-chromium-arm64-nexus5x",'
+ ' "builder": "android-angle-chromium-arm64-pixel2",'
' "project": "chromium"'
' },'
' "builder_spec": {'
@@ -68618,7 +68422,7 @@
' "builder_ids_in_scope_for_testing": ['
' {'
' "bucket": "ci",'
- ' "builder": "android-angle-chromium-arm64-nexus5x",'
+ ' "builder": "android-angle-chromium-arm64-pixel2",'
' "project": "chromium"'
' }'
' ],'
@@ -68705,7 +68509,7 @@
use_invocation_timestamp: true
}
}
- description_html: "This builder mirrors the following CI builders:<br/><ul><li><a href=\"https://ci.chromium.org/p/chromium/builders/ci/android-angle-chromium-arm64-builder\">android-angle-chromium-arm64-builder</a></li><li><a href=\"https://ci.chromium.org/p/chromium/builders/ci/android-angle-chromium-arm64-nexus5x\">android-angle-chromium-arm64-nexus5x</a></li></ul>"
+ description_html: "This builder mirrors the following CI builders:<br/><ul><li><a href=\"https://ci.chromium.org/p/chromium/builders/ci/android-angle-chromium-arm64-builder\">android-angle-chromium-arm64-builder</a></li><li><a href=\"https://ci.chromium.org/p/chromium/builders/ci/android-angle-chromium-arm64-pixel2\">android-angle-chromium-arm64-pixel2</a></li></ul>"
contact_team_email: "angle-team@google.com"
}
builders {
diff --git a/infra/config/generated/luci/luci-milo.cfg b/infra/config/generated/luci/luci-milo.cfg
index df0a88e8..5a252f42 100644
--- a/infra/config/generated/luci/luci-milo.cfg
+++ b/infra/config/generated/luci/luci-milo.cfg
@@ -6219,11 +6219,6 @@
short_name: "arm64"
}
builders {
- name: "buildbucket/luci.chromium.ci/android-angle-chromium-arm64-nexus5x"
- category: "Android|Nexus5X|Chromium"
- short_name: "arm64"
- }
- builders {
name: "buildbucket/luci.chromium.ci/android-angle-chromium-arm64-pixel2"
category: "Android|Pixel2|Chromium"
short_name: "arm64"
diff --git a/infra/config/generated/luci/luci-scheduler.cfg b/infra/config/generated/luci/luci-scheduler.cfg
index affccdf8..97661f9 100644
--- a/infra/config/generated/luci/luci-scheduler.cfg
+++ b/infra/config/generated/luci/luci-scheduler.cfg
@@ -3457,15 +3457,6 @@
}
}
job {
- id: "android-angle-chromium-arm64-nexus5x"
- realm: "ci"
- buildbucket {
- server: "cr-buildbucket.appspot.com"
- bucket: "ci"
- builder: "android-angle-chromium-arm64-nexus5x"
- }
-}
-job {
id: "android-angle-chromium-arm64-pixel2"
realm: "ci"
buildbucket {
diff --git a/infra/config/generated/luci/realms.cfg b/infra/config/generated/luci/realms.cfg
index fe8e38d..ef8f566 100644
--- a/infra/config/generated/luci/realms.cfg
+++ b/infra/config/generated/luci/realms.cfg
@@ -373,7 +373,6 @@
values: "Win10 FYI x64 Release XR Perf (NVIDIA)"
values: "Win10 FYI x86 Release (NVIDIA)"
values: "Win11 FYI arm64 Release (Qualcomm Adreno 690)"
- values: "android-angle-chromium-arm64-nexus5x"
values: "android-angle-chromium-arm64-pixel2"
values: "ios-angle-intel"
values: "linux-angle-chromium-intel"
diff --git a/infra/config/generated/sheriff-rotations/angle.txt b/infra/config/generated/sheriff-rotations/angle.txt
index 1f862eec..4ca96cc 100644
--- a/infra/config/generated/sheriff-rotations/angle.txt
+++ b/infra/config/generated/sheriff-rotations/angle.txt
@@ -1,5 +1,5 @@
ci/android-angle-chromium-arm64-builder
-ci/android-angle-chromium-arm64-nexus5x
+ci/android-angle-chromium-arm64-pixel2
ci/fuchsia-angle-builder
ci/ios-angle-builder
ci/ios-angle-intel
diff --git a/infra/config/lib/builder_exemptions.star b/infra/config/lib/builder_exemptions.star
index c817b28..ac488a4 100644
--- a/infra/config/lib/builder_exemptions.star
+++ b/infra/config/lib/builder_exemptions.star
@@ -273,7 +273,6 @@
"android-13-x64-fyi-rel",
"android-androidx-packager",
"android-angle-chromium-arm64-builder",
- "android-angle-chromium-arm64-nexus5x",
"android-annotator-rel",
"android-archive-rel",
"android-arm64-archive-rel",
diff --git a/infra/config/subprojects/chromium/ci/chromium.angle.star b/infra/config/subprojects/chromium/ci/chromium.angle.star
index df8746b..b60651b 100644
--- a/infra/config/subprojects/chromium/ci/chromium.angle.star
+++ b/infra/config/subprojects/chromium/ci/chromium.angle.star
@@ -3,7 +3,6 @@
# found in the LICENSE file.
"""Definitions of builders in the chromium.angle builder group."""
-load("//lib/args.star", "args")
load("//lib/builders.star", "gardener_rotations", "os", "siso")
load("//lib/builder_config.star", "builder_config")
load("//lib/builder_health_indicators.star", "health_spec")
@@ -86,37 +85,6 @@
)
ci.thin_tester(
- name = "android-angle-chromium-arm64-nexus5x",
- triggered_by = ["android-angle-chromium-arm64-builder"],
- builder_spec = builder_config.builder_spec(
- execution_mode = builder_config.execution_mode.TEST,
- gclient_config = builder_config.gclient_config(
- config = "chromium",
- apply_configs = [
- "android",
- "angle_top_of_tree",
- ],
- ),
- chromium_config = builder_config.chromium_config(
- config = "android",
- build_config = builder_config.build_config.RELEASE,
- target_bits = 64,
- target_platform = builder_config.target_platform.ANDROID,
- ),
- android_config = builder_config.android_config(
- config = "main_builder_mb",
- ),
- build_gs_bucket = "chromium-angle-archive",
- run_tests_serially = True,
- ),
- console_view_entry = consoles.console_view_entry(
- category = "Android|Nexus5X|Chromium",
- short_name = "arm64",
- ),
- contact_team_email = "angle-team@google.com",
-)
-
-ci.thin_tester(
name = "android-angle-chromium-arm64-pixel2",
description_html = "Running Angle chromium tests on Pixel 2",
triggered_by = ["android-angle-chromium-arm64-builder"],
@@ -141,8 +109,6 @@
build_gs_bucket = "chromium-angle-archive",
run_tests_serially = True,
),
- # TODO(crbug.com/355671260): Enable gardener after stable
- gardener_rotations = args.ignore_default(None),
console_view_entry = consoles.console_view_entry(
category = "Android|Pixel2|Chromium",
short_name = "arm64",
diff --git a/infra/config/subprojects/chromium/try/tryserver.chromium.angle.star b/infra/config/subprojects/chromium/try/tryserver.chromium.angle.star
index 90602d1..694faa2 100644
--- a/infra/config/subprojects/chromium/try/tryserver.chromium.angle.star
+++ b/infra/config/subprojects/chromium/try/tryserver.chromium.angle.star
@@ -32,8 +32,7 @@
executable = "recipe:angle_chromium_trybot",
mirrors = [
"ci/android-angle-chromium-arm64-builder",
- # (crbug.com/355671260): Switch to pixel2 CI builder once it's stable
- "ci/android-angle-chromium-arm64-nexus5x",
+ "ci/android-angle-chromium-arm64-pixel2",
],
builder_config_settings = builder_config.try_settings(
retry_failed_shards = False,
diff --git a/testing/buildbot/chromium.angle.json b/testing/buildbot/chromium.angle.json
index ffedba8d..c4533e4d 100644
--- a/testing/buildbot/chromium.angle.json
+++ b/testing/buildbot/chromium.angle.json
@@ -2,48 +2,6 @@
"AAAAA1 AUTOGENERATED FILE DO NOT EDIT": {},
"AAAAA2 See generate_buildbot_json.py to make changes": {},
"android-angle-chromium-arm64-builder": {},
- "android-angle-chromium-arm64-nexus5x": {
- "isolated_scripts": [
- {
- "args": [
- "webgl1_conformance",
- "--show-stdout",
- "--browser=android-chromium",
- "--passthrough",
- "-v",
- "--stable-jobs",
- "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc --use-gl=angle --use-angle=gles --use-cmd-decoder=passthrough --force_high_performance_gpu",
- "--enforce-browser-version",
- "--read-abbreviated-json-results-from=../../content/test/data/gpu/webgl1_conformance_android_runtimes.json",
- "--jobs=1",
- "--initial-find-device-attempts=3"
- ],
- "merge": {
- "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
- },
- "name": "webgl_conformance_gles_passthrough_tests",
- "resultdb": {
- "enable": true,
- "has_native_resultdb_integration": true
- },
- "swarming": {
- "containment_type": "AUTO",
- "dimensions": {
- "device_os": "OPR4.170623.020",
- "device_os_flavor": "google",
- "device_os_type": "userdebug",
- "device_type": "bullhead",
- "os": "Android"
- },
- "idempotent": false,
- "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
- "shards": 6
- },
- "test": "telemetry_gpu_integration_test_android_chrome",
- "test_id_prefix": "ninja://chrome/test:telemetry_gpu_integration_test_android_chrome/"
- }
- ]
- },
"android-angle-chromium-arm64-pixel2": {
"isolated_scripts": [
{
diff --git a/testing/buildbot/waterfalls.pyl b/testing/buildbot/waterfalls.pyl
index e29b8ed..4d106a3 100644
--- a/testing/buildbot/waterfalls.pyl
+++ b/testing/buildbot/waterfalls.pyl
@@ -1281,18 +1281,6 @@
],
'machines': {
'android-angle-chromium-arm64-builder': {},
- 'android-angle-chromium-arm64-nexus5x': {
- 'browser_config': 'android-chromium',
- 'os_type': 'android',
- 'mixins': [
- 'has_native_resultdb_integration',
- 'oreo_fleet',
- 'bullhead',
- ],
- 'test_suites': {
- 'gpu_telemetry_tests': 'gpu_webgl_conformance_gles_passthrough_telemetry_tests',
- },
- },
'android-angle-chromium-arm64-pixel2': {
'browser_config': 'android-chromium',
'os_type': 'android',
