[Blink] Delete ci/android-chrome-pie-x86-wpt-android-specific
Change-Id: Ib23cc7265cba4d924845f78a314dbbf646e80964
Bug: 40279492
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5631084
Commit-Queue: An Sung <ansung@google.com>
Reviewed-by: Haiyang Pan <hypan@google.com>
Cr-Commit-Position: refs/heads/main@{#1315299}
diff --git a/infra/config/generated/builder-owners/~unowned.txt b/infra/config/generated/builder-owners/~unowned.txt
index b9a5280..b40aa59 100644
--- a/infra/config/generated/builder-owners/~unowned.txt
+++ b/infra/config/generated/builder-owners/~unowned.txt
@@ -39,7 +39,6 @@
ci/android-annotator-rel
ci/android-arm64-archive-rel
ci/android-avd-packager
-ci/android-chrome-pie-x86-wpt-android-specific
ci/android-chrome-pie-x86-wpt-fyi-rel
ci/android-code-coverage
ci/android-code-coverage-native
@@ -231,7 +230,6 @@
try/android-asan-compile-dbg
try/android-bfcache-rel
try/android-binary-size
-try/android-chrome-pie-x86-wpt-android-specific
try/android-chrome-pie-x86-wpt-fyi-rel
try/android-clang-tidy-rel
try/android-code-coverage
diff --git a/infra/config/generated/builders/ci/android-chrome-pie-x86-wpt-android-specific/gn-args.json b/infra/config/generated/builders/ci/android-chrome-pie-x86-wpt-android-specific/gn-args.json
deleted file mode 100644
index e421386a..0000000
--- a/infra/config/generated/builders/ci/android-chrome-pie-x86-wpt-android-specific/gn-args.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
- "gn_args": {
- "android_static_analysis": "off",
- "dcheck_always_on": false,
- "debuggable_apks": false,
- "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.apps.chrome",
- "system_webview_shell_package_name": "org.chromium.my_webview_shell",
- "target_cpu": "x86",
- "target_os": "android",
- "use_remoteexec": true,
- "use_siso": true
- }
-}
\ No newline at end of file
diff --git a/infra/config/generated/builders/ci/android-chrome-pie-x86-wpt-android-specific/properties.json b/infra/config/generated/builders/ci/android-chrome-pie-x86-wpt-android-specific/properties.json
deleted file mode 100644
index 3eaccfb9..0000000
--- a/infra/config/generated/builders/ci/android-chrome-pie-x86-wpt-android-specific/properties.json
+++ /dev/null
@@ -1,80 +0,0 @@
-{
- "$build/chromium_tests_builder_config": {
- "builder_config": {
- "additional_exclusions": [
- "infra/config/generated/builders/ci/android-chrome-pie-x86-wpt-android-specific/gn-args.json"
- ],
- "builder_db": {
- "entries": [
- {
- "builder_id": {
- "bucket": "ci",
- "builder": "android-chrome-pie-x86-wpt-android-specific",
- "project": "chromium"
- },
- "builder_spec": {
- "build_gs_bucket": "chromium-android-archive",
- "builder_group": "chromium.android.fyi",
- "execution_mode": "COMPILE_AND_TEST",
- "legacy_android_config": {
- "config": "x86_builder"
- },
- "legacy_chromium_config": {
- "apply_configs": [
- "mb"
- ],
- "build_config": "Release",
- "config": "android",
- "target_bits": 32,
- "target_platform": "android"
- },
- "legacy_gclient_config": {
- "apply_configs": [
- "android"
- ],
- "config": "chromium"
- }
- }
- }
- ]
- },
- "builder_ids": [
- {
- "bucket": "ci",
- "builder": "android-chrome-pie-x86-wpt-android-specific",
- "project": "chromium"
- }
- ],
- "mirroring_builder_group_and_names": [
- {
- "builder": "android-chrome-pie-x86-wpt-android-specific",
- "group": "tryserver.chromium.android"
- }
- ]
- }
- },
- "$build/reclient": {
- "instance": "rbe-chromium-trusted",
- "metrics_project": "chromium-reclient-metrics",
- "scandeps_server": true
- },
- "$build/siso": {
- "configs": [
- "builder"
- ],
- "enable_cloud_profiler": true,
- "enable_cloud_trace": true,
- "experiments": [],
- "project": "rbe-chromium-trusted",
- "remote_jobs": 250
- },
- "$recipe_engine/resultdb/test_presentation": {
- "column_keys": [],
- "grouping_keys": [
- "status",
- "v.test_suite"
- ]
- },
- "builder_group": "chromium.android.fyi",
- "recipe": "chromium"
-}
\ No newline at end of file
diff --git a/infra/config/generated/builders/ci/android-chrome-pie-x86-wpt-android-specific/shadow-properties.json b/infra/config/generated/builders/ci/android-chrome-pie-x86-wpt-android-specific/shadow-properties.json
deleted file mode 100644
index 673c7c0..0000000
--- a/infra/config/generated/builders/ci/android-chrome-pie-x86-wpt-android-specific/shadow-properties.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
- "$build/reclient": {
- "instance": "rbe-chromium-untrusted",
- "metrics_project": "chromium-reclient-metrics",
- "scandeps_server": true
- },
- "$build/siso": {
- "configs": [
- "builder"
- ],
- "enable_cloud_profiler": true,
- "enable_cloud_trace": true,
- "experiments": [],
- "project": "rbe-chromium-untrusted",
- "remote_jobs": 250
- }
-}
\ No newline at end of file
diff --git a/infra/config/generated/builders/gn_args_locations.json b/infra/config/generated/builders/gn_args_locations.json
index 9cf5c90..150cc48 100644
--- a/infra/config/generated/builders/gn_args_locations.json
+++ b/infra/config/generated/builders/gn_args_locations.json
@@ -72,7 +72,6 @@
"android-13-x64-fyi-rel": "ci/android-13-x64-fyi-rel/gn-args.json",
"android-15-x64-fyi-rel": "ci/android-15-x64-fyi-rel/gn-args.json",
"android-annotator-rel": "ci/android-annotator-rel/gn-args.json",
- "android-chrome-pie-x86-wpt-android-specific": "ci/android-chrome-pie-x86-wpt-android-specific/gn-args.json",
"android-chrome-pie-x86-wpt-fyi-rel": "ci/android-chrome-pie-x86-wpt-fyi-rel/gn-args.json",
"android-cronet-asan-x86-rel": "ci/android-cronet-asan-x86-rel/gn-args.json",
"android-mte-arm64-rel": "ci/android-mte-arm64-rel/gn-args.json",
@@ -557,7 +556,6 @@
"android-asan-compile-dbg": "try/android-asan-compile-dbg/gn-args.json",
"android-bfcache-rel": "try/android-bfcache-rel/gn-args.json",
"android-binary-size": "try/android-binary-size/gn-args.json",
- "android-chrome-pie-x86-wpt-android-specific": "try/android-chrome-pie-x86-wpt-android-specific/gn-args.json",
"android-chrome-pie-x86-wpt-fyi-rel": "try/android-chrome-pie-x86-wpt-fyi-rel/gn-args.json",
"android-clobber-rel": "try/android-clobber-rel/gn-args.json",
"android-code-coverage": "try/android-code-coverage/gn-args.json",
diff --git a/infra/config/generated/builders/try/android-chrome-pie-x86-wpt-android-specific/gn-args.json b/infra/config/generated/builders/try/android-chrome-pie-x86-wpt-android-specific/gn-args.json
deleted file mode 100644
index f55c7e7..0000000
--- a/infra/config/generated/builders/try/android-chrome-pie-x86-wpt-android-specific/gn-args.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
- "gn_args": {
- "android_static_analysis": "off",
- "dcheck_always_on": true,
- "debuggable_apks": false,
- "ffmpeg_branding": "Chrome",
- "is_component_build": false,
- "is_debug": false,
- "proprietary_codecs": true,
- "strip_debug_info": true,
- "symbol_level": 0,
- "system_webview_package_name": "com.google.android.apps.chrome",
- "system_webview_shell_package_name": "org.chromium.my_webview_shell",
- "target_cpu": "x86",
- "target_os": "android",
- "use_remoteexec": true,
- "use_siso": true
- }
-}
\ No newline at end of file
diff --git a/infra/config/generated/builders/try/android-chrome-pie-x86-wpt-android-specific/properties.json b/infra/config/generated/builders/try/android-chrome-pie-x86-wpt-android-specific/properties.json
deleted file mode 100644
index 76c6671..0000000
--- a/infra/config/generated/builders/try/android-chrome-pie-x86-wpt-android-specific/properties.json
+++ /dev/null
@@ -1,74 +0,0 @@
-{
- "$build/chromium_tests_builder_config": {
- "builder_config": {
- "additional_exclusions": [
- "infra/config/generated/builders/try/android-chrome-pie-x86-wpt-android-specific/gn-args.json"
- ],
- "builder_db": {
- "entries": [
- {
- "builder_id": {
- "bucket": "ci",
- "builder": "android-chrome-pie-x86-wpt-android-specific",
- "project": "chromium"
- },
- "builder_spec": {
- "build_gs_bucket": "chromium-android-archive",
- "builder_group": "chromium.android.fyi",
- "execution_mode": "COMPILE_AND_TEST",
- "legacy_android_config": {
- "config": "x86_builder"
- },
- "legacy_chromium_config": {
- "apply_configs": [
- "mb"
- ],
- "build_config": "Release",
- "config": "android",
- "target_bits": 32,
- "target_platform": "android"
- },
- "legacy_gclient_config": {
- "apply_configs": [
- "android"
- ],
- "config": "chromium"
- }
- }
- }
- ]
- },
- "builder_ids": [
- {
- "bucket": "ci",
- "builder": "android-chrome-pie-x86-wpt-android-specific",
- "project": "chromium"
- }
- ]
- }
- },
- "$build/reclient": {
- "instance": "rbe-chromium-untrusted",
- "metrics_project": "chromium-reclient-metrics",
- "scandeps_server": true
- },
- "$build/siso": {
- "configs": [
- "builder"
- ],
- "enable_cloud_profiler": true,
- "enable_cloud_trace": true,
- "experiments": [],
- "project": "rbe-chromium-untrusted",
- "remote_jobs": -1
- },
- "$recipe_engine/resultdb/test_presentation": {
- "column_keys": [],
- "grouping_keys": [
- "status",
- "v.test_suite"
- ]
- },
- "builder_group": "tryserver.chromium.android",
- "recipe": "chromium_trybot"
-}
\ No newline at end of file
diff --git a/infra/config/generated/health-specs/health-specs.json b/infra/config/generated/health-specs/health-specs.json
index 25e1c172..316a993 100644
--- a/infra/config/generated/health-specs/health-specs.json
+++ b/infra/config/generated/health-specs/health-specs.json
@@ -6867,26 +6867,6 @@
}
]
},
- "android-chrome-pie-x86-wpt-android-specific": {
- "problem_specs": [
- {
- "name": "Unhealthy",
- "period_days": 7,
- "score": 5,
- "thresholds": {
- "_default": "_default"
- }
- },
- {
- "name": "Low Value",
- "period_days": 90,
- "score": 1,
- "thresholds": {
- "_default": "_default"
- }
- }
- ]
- },
"android-chrome-pie-x86-wpt-fyi-rel": {
"problem_specs": [
{
diff --git a/infra/config/generated/luci/commit-queue.cfg b/infra/config/generated/luci/commit-queue.cfg
index f1f2fb74..4002dfb 100644
--- a/infra/config/generated/luci/commit-queue.cfg
+++ b/infra/config/generated/luci/commit-queue.cfg
@@ -645,10 +645,6 @@
mode_allowlist: "FULL_RUN"
}
builders {
- name: "chromium/try/android-chrome-pie-x86-wpt-android-specific"
- includable_only: true
- }
- builders {
name: "chromium/try/android-chrome-pie-x86-wpt-fyi-rel"
includable_only: true
}
diff --git a/infra/config/generated/luci/cr-buildbucket.cfg b/infra/config/generated/luci/cr-buildbucket.cfg
index 61abef1..d548c42 100644
--- a/infra/config/generated/luci/cr-buildbucket.cfg
+++ b/infra/config/generated/luci/cr-buildbucket.cfg
@@ -33740,100 +33740,6 @@
contact_team_email: "clank-engprod@google.com"
}
builders {
- name: "android-chrome-pie-x86-wpt-android-specific"
- swarming_host: "chromium-swarm.appspot.com"
- dimensions: "builderless:1"
- dimensions: "cores:8"
- dimensions: "cpu:x86-64"
- dimensions: "free_space:standard"
- dimensions: "os:Ubuntu-22.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/android-chrome-pie-x86-wpt-android-specific/properties.json",'
- ' "shadow_properties_file": "infra/config/generated/builders/ci/android-chrome-pie-x86-wpt-android-specific/shadow-properties.json",'
- ' "top_level_project": {'
- ' "ref": "refs/heads/main",'
- ' "repo": {'
- ' "host": "chromium.googlesource.com",'
- ' "project": "chromium/src"'
- ' }'
- ' }'
- ' },'
- ' "builder_group": "chromium.android.fyi",'
- ' "led_builder_is_bootstrapped": true,'
- ' "recipe": "chromium"'
- '}'
- priority: 35
- execution_timeout_secs: 10800
- build_numbers: YES
- service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
- experimental: YES
- 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-chrome-pie-x86-wpt-android-specific\">android-chrome-pie-x86-wpt-android-specific</a></li></ul>"
- shadow_builder_adjustments {
- service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
- pool: "luci.chromium.try"
- dimensions: "free_space:"
- dimensions: "pool:luci.chromium.try"
- }
- }
- builders {
name: "android-chrome-pie-x86-wpt-fyi-rel"
swarming_host: "chromium-swarm.appspot.com"
dimensions: "builderless:1"
@@ -67505,102 +67411,6 @@
}
}
builders {
- name: "android-chrome-pie-x86-wpt-android-specific"
- swarming_host: "chromium-swarm.appspot.com"
- dimensions: "builderless:1"
- dimensions: "cores:8"
- dimensions: "cpu:x86-64"
- dimensions: "os:Ubuntu-22.04"
- dimensions: "pool:luci.chromium.try"
- 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/try/android-chrome-pie-x86-wpt-android-specific/properties.json",'
- ' "top_level_project": {'
- ' "ref": "refs/heads/main",'
- ' "repo": {'
- ' "host": "chromium.googlesource.com",'
- ' "project": "chromium/src"'
- ' }'
- ' }'
- ' },'
- ' "builder_group": "tryserver.chromium.android",'
- ' "led_builder_is_bootstrapped": true,'
- ' "recipe": "chromium_trybot"'
- '}'
- execution_timeout_secs: 14400
- expiration_secs: 7200
- grace_period {
- seconds: 120
- }
- build_numbers: YES
- service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
- experiments {
- key: "chromium_swarming.expose_merge_script_failures"
- value: 100
- }
- experiments {
- key: "luci.buildbucket.canary_software"
- value: 5
- }
- experiments {
- key: "luci.recipes.use_python3"
- value: 100
- }
- experiments {
- key: "swarming.prpc.cli"
- 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|content)/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/.+)|(ninja://[^/]*_wpt_tests/.+)"
- }
- }
- }
- history_options {
- 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-chrome-pie-x86-wpt-android-specific\">android-chrome-pie-x86-wpt-android-specific</a></li></ul>"
- }
- builders {
name: "android-chrome-pie-x86-wpt-fyi-rel"
swarming_host: "chromium-swarm.appspot.com"
dimensions: "builderless:1"
diff --git a/infra/config/generated/luci/luci-milo.cfg b/infra/config/generated/luci/luci-milo.cfg
index 7e1fa3c..8113e41a8 100644
--- a/infra/config/generated/luci/luci-milo.cfg
+++ b/infra/config/generated/luci/luci-milo.cfg
@@ -5576,11 +5576,6 @@
short_name: "13"
}
builders {
- name: "buildbucket/luci.chromium.ci/android-chrome-pie-x86-wpt-android-specific"
- category: "wpt|chrome"
- short_name: "p-x86"
- }
- builders {
name: "buildbucket/luci.chromium.ci/android-chrome-pie-x86-wpt-fyi-rel"
category: "wpt|chrome"
short_name: "p-x86"
@@ -16377,9 +16372,6 @@
name: "buildbucket/luci.chromium.try/android-binary-size"
}
builders {
- name: "buildbucket/luci.chromium.try/android-chrome-pie-x86-wpt-android-specific"
- }
- builders {
name: "buildbucket/luci.chromium.try/android-chrome-pie-x86-wpt-fyi-rel"
}
builders {
@@ -17837,9 +17829,6 @@
name: "buildbucket/luci.chromium.try/android-binary-size"
}
builders {
- name: "buildbucket/luci.chromium.try/android-chrome-pie-x86-wpt-android-specific"
- }
- builders {
name: "buildbucket/luci.chromium.try/android-chrome-pie-x86-wpt-fyi-rel"
}
builders {
diff --git a/infra/config/generated/luci/luci-scheduler.cfg b/infra/config/generated/luci/luci-scheduler.cfg
index bf978fe..05fc6ef 100644
--- a/infra/config/generated/luci/luci-scheduler.cfg
+++ b/infra/config/generated/luci/luci-scheduler.cfg
@@ -3521,15 +3521,6 @@
}
}
job {
- id: "android-chrome-pie-x86-wpt-android-specific"
- realm: "ci"
- buildbucket {
- server: "cr-buildbucket.appspot.com"
- bucket: "ci"
- builder: "android-chrome-pie-x86-wpt-android-specific"
- }
-}
-job {
id: "android-chrome-pie-x86-wpt-fyi-rel"
realm: "ci"
buildbucket {
@@ -6545,7 +6536,6 @@
triggers: "android-asan"
triggers: "android-bfcache-rel"
triggers: "android-binary-size-generator"
- triggers: "android-chrome-pie-x86-wpt-android-specific"
triggers: "android-chrome-pie-x86-wpt-fyi-rel"
triggers: "android-cronet-arm-dbg"
triggers: "android-cronet-arm-rel"
diff --git a/infra/config/generated/testing/test_suites.pyl b/infra/config/generated/testing/test_suites.pyl
index 9484c12..0dde66c3 100644
--- a/infra/config/generated/testing/test_suites.pyl
+++ b/infra/config/generated/testing/test_suites.pyl
@@ -5553,33 +5553,6 @@
'experiment_percentage': 100,
},
},
-
- 'wpt_web_tests_android': {
- 'chrome_public_wpt': {
- 'results_handler': 'layout tests',
- 'swarming': {
- 'shards': 4,
- },
- 'merge': {
- 'script': '//third_party/blink/tools/merge_web_test_results.py',
- 'args': [
- '--verbose',
- ],
- },
- },
- 'system_webview_wpt': {
- 'results_handler': 'layout tests',
- 'swarming': {
- 'shards': 4,
- },
- 'merge': {
- 'script': '//third_party/blink/tools/merge_web_test_results.py',
- 'args': [
- '--verbose',
- ],
- },
- },
- },
},
'compound_suites': {
diff --git a/infra/config/lib/builder_health_indicators.star b/infra/config/lib/builder_health_indicators.star
index 65faf93..e3e1051 100644
--- a/infra/config/lib/builder_health_indicators.star
+++ b/infra/config/lib/builder_health_indicators.star
@@ -329,7 +329,6 @@
"android-asan",
"android-avd-packager",
"android-build-perf-developer",
- "android-chrome-pie-x86-wpt-android-specific",
"android-chrome-pie-x86-wpt-fyi-rel",
"android-code-coverage",
"android-code-coverage-native",
@@ -538,7 +537,6 @@
"android-asan-compile-dbg",
"android-bfcache-rel",
"android-binary-size",
- "android-chrome-pie-x86-wpt-android-specific",
"android-chrome-pie-x86-wpt-fyi-rel",
"android-clang-tidy-rel",
"android-clobber-rel",
diff --git a/infra/config/lib/description_exceptions.star b/infra/config/lib/description_exceptions.star
index b594818e..dd0f7f7 100644
--- a/infra/config/lib/description_exceptions.star
+++ b/infra/config/lib/description_exceptions.star
@@ -279,7 +279,6 @@
"android-avd-packager",
"android-bfcache-rel",
"android-binary-size-generator",
- "android-chrome-pie-x86-wpt-android-specific",
"android-chrome-pie-x86-wpt-fyi-rel",
"android-code-coverage",
"android-code-coverage-native",
@@ -579,7 +578,6 @@
"android-asan-compile-dbg",
"android-bfcache-rel",
"android-binary-size",
- "android-chrome-pie-x86-wpt-android-specific",
"android-chrome-pie-x86-wpt-fyi-rel",
"android-clang-tidy-rel",
"android-clobber-rel",
diff --git a/infra/config/subprojects/chromium/ci/chromium.android.fyi.star b/infra/config/subprojects/chromium/ci/chromium.android.fyi.star
index d45ee8d..4be3598d 100644
--- a/infra/config/subprojects/chromium/ci/chromium.android.fyi.star
+++ b/infra/config/subprojects/chromium/ci/chromium.android.fyi.star
@@ -71,43 +71,6 @@
)
ci.builder(
- name = "android-chrome-pie-x86-wpt-android-specific",
- builder_spec = builder_config.builder_spec(
- gclient_config = builder_config.gclient_config(
- config = "chromium",
- apply_configs = ["android"],
- ),
- chromium_config = builder_config.chromium_config(
- config = "android",
- apply_configs = ["mb"],
- build_config = builder_config.build_config.RELEASE,
- target_bits = 32,
- target_platform = builder_config.target_platform.ANDROID,
- ),
- android_config = builder_config.android_config(config = "x86_builder"),
- build_gs_bucket = "chromium-android-archive",
- ),
- gn_args = gn_args.config(
- configs = [
- "android_builder",
- "release_builder",
- "remoteexec",
- "minimal_symbols",
- "x86",
- "strip_debug_info",
- "android_fastbuild",
- "webview_monochrome",
- "webview_shell",
- ],
- ),
- console_view_entry = consoles.console_view_entry(
- category = "wpt|chrome",
- short_name = "p-x86",
- ),
- experimental = True,
-)
-
-ci.builder(
name = "android-webview-pie-x86-wpt-fyi-rel",
builder_spec = builder_config.builder_spec(
gclient_config = builder_config.gclient_config(
diff --git a/infra/config/subprojects/chromium/try/tryserver.chromium.android.star b/infra/config/subprojects/chromium/try/tryserver.chromium.android.star
index 3db338f3..dddb27b7 100644
--- a/infra/config/subprojects/chromium/try/tryserver.chromium.android.star
+++ b/infra/config/subprojects/chromium/try/tryserver.chromium.android.star
@@ -854,17 +854,6 @@
)
try_.builder(
- name = "android-chrome-pie-x86-wpt-android-specific",
- mirrors = ["ci/android-chrome-pie-x86-wpt-android-specific"],
- gn_args = gn_args.config(
- configs = [
- "ci/android-chrome-pie-x86-wpt-android-specific",
- "release_try_builder",
- ],
- ),
-)
-
-try_.builder(
name = "android-webview-12-x64-dbg",
mirrors = [
"ci/Android x64 Builder (dbg)",
diff --git a/infra/config/targets/basic_suites.star b/infra/config/targets/basic_suites.star
index d81d2ac..a53fda3 100644
--- a/infra/config/targets/basic_suites.star
+++ b/infra/config/targets/basic_suites.star
@@ -5343,19 +5343,3 @@
),
},
)
-
-targets.legacy_basic_suite(
- name = "wpt_web_tests_android",
- tests = {
- "chrome_public_wpt": targets.legacy_test_config(
- swarming = targets.swarming(
- shards = 4,
- ),
- ),
- "system_webview_wpt": targets.legacy_test_config(
- swarming = targets.swarming(
- shards = 4,
- ),
- ),
- },
-)
diff --git a/testing/buildbot/chromium.android.fyi.json b/testing/buildbot/chromium.android.fyi.json
index b78fd47..d11dc33a 100644
--- a/testing/buildbot/chromium.android.fyi.json
+++ b/testing/buildbot/chromium.android.fyi.json
@@ -13143,98 +13143,6 @@
}
]
},
- "android-chrome-pie-x86-wpt-android-specific": {
- "isolated_scripts": [
- {
- "args": [
- "--avd-config=../../tools/android/avd/proto/android_28_google_apis_x86.textpb",
- "--test-list",
- "../../third_party/blink/web_tests/TestLists/android.filter"
- ],
- "merge": {
- "args": [
- "--verbose"
- ],
- "script": "//third_party/blink/tools/merge_web_test_results.py"
- },
- "name": "chrome_public_wpt",
- "resultdb": {
- "enable": true,
- "has_native_resultdb_integration": true
- },
- "results_handler": "layout tests",
- "swarming": {
- "dimensions": {
- "cores": "8",
- "cpu": "x86-64",
- "device_os": null,
- "device_type": null,
- "os": "Ubuntu-22.04",
- "pool": "chromium.tests.avd"
- },
- "named_caches": [
- {
- "name": "android_28_google_apis_x86",
- "path": ".android_emulator/android_28_google_apis_x86"
- }
- ],
- "optional_dimensions": {
- "60": {
- "caches": "android_28_google_apis_x86"
- }
- },
- "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
- "shards": 4
- },
- "test": "chrome_public_wpt",
- "test_id_prefix": "ninja://chrome/android:chrome_public_wpt/"
- },
- {
- "args": [
- "--avd-config=../../tools/android/avd/proto/android_28_google_apis_x86.textpb",
- "--test-list",
- "../../third_party/blink/web_tests/TestLists/android.filter"
- ],
- "merge": {
- "args": [
- "--verbose"
- ],
- "script": "//third_party/blink/tools/merge_web_test_results.py"
- },
- "name": "system_webview_wpt",
- "resultdb": {
- "enable": true,
- "has_native_resultdb_integration": true
- },
- "results_handler": "layout tests",
- "swarming": {
- "dimensions": {
- "cores": "8",
- "cpu": "x86-64",
- "device_os": null,
- "device_type": null,
- "os": "Ubuntu-22.04",
- "pool": "chromium.tests.avd"
- },
- "named_caches": [
- {
- "name": "android_28_google_apis_x86",
- "path": ".android_emulator/android_28_google_apis_x86"
- }
- ],
- "optional_dimensions": {
- "60": {
- "caches": "android_28_google_apis_x86"
- }
- },
- "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
- "shards": 4
- },
- "test": "system_webview_wpt",
- "test_id_prefix": "ninja://android_webview/test:system_webview_wpt/"
- }
- ]
- },
"android-chrome-pie-x86-wpt-fyi-rel": {
"isolated_scripts": [
{
diff --git a/testing/buildbot/test_suite_exceptions.pyl b/testing/buildbot/test_suite_exceptions.pyl
index 8333073..3fd1aa7 100644
--- a/testing/buildbot/test_suite_exceptions.pyl
+++ b/testing/buildbot/test_suite_exceptions.pyl
@@ -1577,12 +1577,6 @@
},
'chrome_public_wpt': {
'modifications': {
- 'android-chrome-pie-x86-wpt-android-specific': {
- 'args': [
- '--test-list',
- '../../third_party/blink/web_tests/TestLists/android.filter'
- ]
- },
'android-chrome-pie-x86-wpt-fyi-rel': {
'args': [
'--use-upstream-wpt',
@@ -4436,12 +4430,6 @@
},
'system_webview_wpt': {
'modifications': {
- 'android-chrome-pie-x86-wpt-android-specific': {
- 'args': [
- '--test-list',
- '../../third_party/blink/web_tests/TestLists/android.filter'
- ]
- },
'android-webview-pie-x86-wpt-fyi-rel': {
'args': [
'--use-upstream-wpt',
diff --git a/testing/buildbot/test_suites.pyl b/testing/buildbot/test_suites.pyl
index 9484c12..0dde66c3 100644
--- a/testing/buildbot/test_suites.pyl
+++ b/testing/buildbot/test_suites.pyl
@@ -5553,33 +5553,6 @@
'experiment_percentage': 100,
},
},
-
- 'wpt_web_tests_android': {
- 'chrome_public_wpt': {
- 'results_handler': 'layout tests',
- 'swarming': {
- 'shards': 4,
- },
- 'merge': {
- 'script': '//third_party/blink/tools/merge_web_test_results.py',
- 'args': [
- '--verbose',
- ],
- },
- },
- 'system_webview_wpt': {
- 'results_handler': 'layout tests',
- 'swarming': {
- 'shards': 4,
- },
- 'merge': {
- 'script': '//third_party/blink/tools/merge_web_test_results.py',
- 'args': [
- '--verbose',
- ],
- },
- },
- },
},
'compound_suites': {
diff --git a/testing/buildbot/waterfalls.pyl b/testing/buildbot/waterfalls.pyl
index 6f03abb..be1390a 100644
--- a/testing/buildbot/waterfalls.pyl
+++ b/testing/buildbot/waterfalls.pyl
@@ -1160,19 +1160,6 @@
},
'os_type': 'android',
},
- 'android-chrome-pie-x86-wpt-android-specific': {
- 'mixins': [
- 'has_native_resultdb_integration',
- 'pie-x86-emulator',
- 'emulator-8-cores',
- 'linux-jammy',
- 'x86-64',
- ],
- 'test_suites': {
- 'isolated_scripts': 'wpt_web_tests_android',
- },
- 'os_type': 'android',
- },
'android-chrome-pie-x86-wpt-fyi-rel': {
'mixins': [
'has_native_resultdb_integration',
