Remove old Nexus perf bots
Bug: b/236797526
Change-Id: I3a3b88fb29ef8a8df074ead975c785a0bfbc84a7
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/287700
Reviewed-by: Jeremy Leconte <jleconte@google.com>
Commit-Queue: Björn Terelius <terelius@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#38895}
diff --git a/infra/config/config.star b/infra/config/config.star
index 589f9e1..b2f5f6b 100755
--- a/infra/config/config.star
+++ b/infra/config/config.star
@@ -716,8 +716,6 @@
android_try_job("android_arm_rel_reclient", cq = {"experiment_percentage": 100})
android_builder("Android32 Builder arm", "Android|arm|size", perf_cat = "Android|arm|Builder|", prioritized = True)
android_try_job("android_compile_arm_rel")
-perf_builder("Perf Android32 (M Nexus5)", "Android|arm|Tester|M Nexus5", triggered_by = ["Android32 Builder arm"])
-perf_builder("Perf Android32 (M AOSP Nexus6)", "Android|arm|Tester|M AOSP Nexus6", triggered_by = ["Android32 Builder arm"])
perf_builder("Perf Android32 (O Pixel2)", "Android|arm|Tester|O Pixel2", triggered_by = ["Android32 Builder arm"])
perf_builder("Perf Android32 (R Pixel5)", "Android|arm|Tester|R Pixel5", triggered_by = ["Android32 Builder arm"])
android_try_job("android_compile_arm64_dbg", cq = None)
@@ -725,7 +723,6 @@
android_builder("Android64", "Android|arm64|rel")
android_try_job("android_arm64_rel")
android_builder("Android64 Builder arm64", "Android|arm64|size", perf_cat = "Android|arm64|Builder|", prioritized = True)
-perf_builder("Perf Android64 (M Nexus5X)", "Android|arm64|Tester|M Nexus5X", triggered_by = ["Android64 Builder arm64"])
perf_builder("Perf Android64 (O Pixel2)", "Android|arm64|Tester|O Pixel2", triggered_by = ["Android64 Builder arm64"])
perf_builder("Perf Android64 (R Pixel5)", "Android|arm64|Tester|R Pixel5", triggered_by = ["Android64 Builder arm64"])
android_try_job("android_compile_arm64_rel")
diff --git a/infra/config/cr-buildbucket.cfg b/infra/config/cr-buildbucket.cfg
index 6d8852c..baaba03 100644
--- a/infra/config/cr-buildbucket.cfg
+++ b/infra/config/cr-buildbucket.cfg
@@ -2537,106 +2537,6 @@
}
}
builders {
- name: "Perf Android32 (M AOSP Nexus6)"
- swarming_host: "chromium-swarm.appspot.com"
- swarming_tags: "vpython:native-python-wrapper"
- dimensions: "cores:8"
- dimensions: "os:Linux"
- dimensions: "pool:luci.webrtc.perf"
- exe {
- cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
- cipd_version: "refs/heads/main"
- cmd: "luciexe"
- }
- properties:
- '{'
- ' "$build/goma": {'
- ' "server_host": "goma.chromium.org",'
- ' "use_luci_auth": true'
- ' },'
- ' "$build/reclient": {'
- ' "instance": "rbe-webrtc-trusted",'
- ' "metrics_project": "chromium-reclient-metrics"'
- ' },'
- ' "$recipe_engine/resultdb/test_presentation": {'
- ' "column_keys": [],'
- ' "grouping_keys": ['
- ' "status",'
- ' "v.test_suite"'
- ' ]'
- ' },'
- ' "builder_group": "client.webrtc.perf",'
- ' "recipe": "webrtc/standalone"'
- '}'
- priority: 30
- execution_timeout_secs: 10800
- build_numbers: YES
- service_account: "webrtc-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
- experiments {
- key: "luci.recipes.use_python3"
- value: 100
- }
- resultdb {
- enable: true
- bq_exports {
- project: "webrtc-ci"
- dataset: "resultdb"
- table: "perf_test_results"
- test_results {}
- }
- }
- }
- builders {
- name: "Perf Android32 (M Nexus5)"
- swarming_host: "chromium-swarm.appspot.com"
- swarming_tags: "vpython:native-python-wrapper"
- dimensions: "cores:8"
- dimensions: "os:Linux"
- dimensions: "pool:luci.webrtc.perf"
- exe {
- cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
- cipd_version: "refs/heads/main"
- cmd: "luciexe"
- }
- properties:
- '{'
- ' "$build/goma": {'
- ' "server_host": "goma.chromium.org",'
- ' "use_luci_auth": true'
- ' },'
- ' "$build/reclient": {'
- ' "instance": "rbe-webrtc-trusted",'
- ' "metrics_project": "chromium-reclient-metrics"'
- ' },'
- ' "$recipe_engine/resultdb/test_presentation": {'
- ' "column_keys": [],'
- ' "grouping_keys": ['
- ' "status",'
- ' "v.test_suite"'
- ' ]'
- ' },'
- ' "builder_group": "client.webrtc.perf",'
- ' "recipe": "webrtc/standalone"'
- '}'
- priority: 30
- execution_timeout_secs: 10800
- build_numbers: YES
- service_account: "webrtc-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
- experiments {
- key: "luci.recipes.use_python3"
- value: 100
- }
- resultdb {
- enable: true
- bq_exports {
- project: "webrtc-ci"
- dataset: "resultdb"
- table: "perf_test_results"
- test_results {}
- }
- }
- }
- builders {
name: "Perf Android32 (O Pixel2)"
swarming_host: "chromium-swarm.appspot.com"
swarming_tags: "vpython:native-python-wrapper"
@@ -2737,56 +2637,6 @@
}
}
builders {
- name: "Perf Android64 (M Nexus5X)"
- swarming_host: "chromium-swarm.appspot.com"
- swarming_tags: "vpython:native-python-wrapper"
- dimensions: "cores:8"
- dimensions: "os:Linux"
- dimensions: "pool:luci.webrtc.perf"
- exe {
- cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
- cipd_version: "refs/heads/main"
- cmd: "luciexe"
- }
- properties:
- '{'
- ' "$build/goma": {'
- ' "server_host": "goma.chromium.org",'
- ' "use_luci_auth": true'
- ' },'
- ' "$build/reclient": {'
- ' "instance": "rbe-webrtc-trusted",'
- ' "metrics_project": "chromium-reclient-metrics"'
- ' },'
- ' "$recipe_engine/resultdb/test_presentation": {'
- ' "column_keys": [],'
- ' "grouping_keys": ['
- ' "status",'
- ' "v.test_suite"'
- ' ]'
- ' },'
- ' "builder_group": "client.webrtc.perf",'
- ' "recipe": "webrtc/standalone"'
- '}'
- priority: 30
- execution_timeout_secs: 10800
- build_numbers: YES
- service_account: "webrtc-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
- experiments {
- key: "luci.recipes.use_python3"
- value: 100
- }
- resultdb {
- enable: true
- bq_exports {
- project: "webrtc-ci"
- dataset: "resultdb"
- table: "perf_test_results"
- test_results {}
- }
- }
- }
- builders {
name: "Perf Android64 (O Pixel2)"
swarming_host: "chromium-swarm.appspot.com"
swarming_tags: "vpython:native-python-wrapper"
diff --git a/infra/config/luci-milo.cfg b/infra/config/luci-milo.cfg
index d8cb107..fe24277 100644
--- a/infra/config/luci-milo.cfg
+++ b/infra/config/luci-milo.cfg
@@ -295,16 +295,6 @@
category: "Android|arm|Builder"
}
builders {
- name: "buildbucket/luci.webrtc.perf/Perf Android32 (M Nexus5)"
- category: "Android|arm|Tester"
- short_name: "M Nexus5"
- }
- builders {
- name: "buildbucket/luci.webrtc.perf/Perf Android32 (M AOSP Nexus6)"
- category: "Android|arm|Tester"
- short_name: "M AOSP Nexus6"
- }
- builders {
name: "buildbucket/luci.webrtc.perf/Perf Android32 (O Pixel2)"
category: "Android|arm|Tester"
short_name: "O Pixel2"
@@ -319,11 +309,6 @@
category: "Android|arm64|Builder"
}
builders {
- name: "buildbucket/luci.webrtc.perf/Perf Android64 (M Nexus5X)"
- category: "Android|arm64|Tester"
- short_name: "M Nexus5X"
- }
- builders {
name: "buildbucket/luci.webrtc.perf/Perf Android64 (O Pixel2)"
category: "Android|arm64|Tester"
short_name: "O Pixel2"
diff --git a/infra/config/luci-notify.cfg b/infra/config/luci-notify.cfg
index c903891..36ada3b 100644
--- a/infra/config/luci-notify.cfg
+++ b/infra/config/luci-notify.cfg
@@ -1274,50 +1274,6 @@
}
builders {
bucket: "perf"
- name: "Perf Android32 (M AOSP Nexus6)"
- repository: "https://webrtc.googlesource.com/src"
- }
-}
-notifiers {
- notifications {
- on_new_status: INFRA_FAILURE
- email {
- recipients: "webrtc-troopers-robots@google.com"
- }
- template: "infra_failure"
- }
- notifications {
- on_new_status: FAILURE
- email {
- recipients: "webrtc-troopers-robots@google.com"
- }
- template: "build_failure"
- notify_blamelist {}
- }
- builders {
- bucket: "perf"
- name: "Perf Android32 (M Nexus5)"
- repository: "https://webrtc.googlesource.com/src"
- }
-}
-notifiers {
- notifications {
- on_new_status: INFRA_FAILURE
- email {
- recipients: "webrtc-troopers-robots@google.com"
- }
- template: "infra_failure"
- }
- notifications {
- on_new_status: FAILURE
- email {
- recipients: "webrtc-troopers-robots@google.com"
- }
- template: "build_failure"
- notify_blamelist {}
- }
- builders {
- bucket: "perf"
name: "Perf Android32 (O Pixel2)"
repository: "https://webrtc.googlesource.com/src"
}
@@ -1362,28 +1318,6 @@
}
builders {
bucket: "perf"
- name: "Perf Android64 (M Nexus5X)"
- repository: "https://webrtc.googlesource.com/src"
- }
-}
-notifiers {
- notifications {
- on_new_status: INFRA_FAILURE
- email {
- recipients: "webrtc-troopers-robots@google.com"
- }
- template: "infra_failure"
- }
- notifications {
- on_new_status: FAILURE
- email {
- recipients: "webrtc-troopers-robots@google.com"
- }
- template: "build_failure"
- notify_blamelist {}
- }
- builders {
- bucket: "perf"
name: "Perf Android64 (O Pixel2)"
repository: "https://webrtc.googlesource.com/src"
}
diff --git a/infra/config/luci-scheduler.cfg b/infra/config/luci-scheduler.cfg
index b115874..3080e25 100644
--- a/infra/config/luci-scheduler.cfg
+++ b/infra/config/luci-scheduler.cfg
@@ -366,42 +366,6 @@
}
}
job {
- id: "Perf Android32 (M AOSP Nexus6)"
- realm: "perf"
- acls {
- role: TRIGGERER
- granted_to: "webrtc-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
- }
- acl_sets: "perf"
- triggering_policy {
- kind: LOGARITHMIC_BATCHING
- log_base: 1.7
- }
- buildbucket {
- server: "cr-buildbucket.appspot.com"
- bucket: "perf"
- builder: "Perf Android32 (M AOSP Nexus6)"
- }
-}
-job {
- id: "Perf Android32 (M Nexus5)"
- realm: "perf"
- acls {
- role: TRIGGERER
- granted_to: "webrtc-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
- }
- acl_sets: "perf"
- triggering_policy {
- kind: LOGARITHMIC_BATCHING
- log_base: 1.7
- }
- buildbucket {
- server: "cr-buildbucket.appspot.com"
- bucket: "perf"
- builder: "Perf Android32 (M Nexus5)"
- }
-}
-job {
id: "Perf Android32 (O Pixel2)"
realm: "perf"
acls {
@@ -438,24 +402,6 @@
}
}
job {
- id: "Perf Android64 (M Nexus5X)"
- realm: "perf"
- acls {
- role: TRIGGERER
- granted_to: "webrtc-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
- }
- acl_sets: "perf"
- triggering_policy {
- kind: LOGARITHMIC_BATCHING
- log_base: 1.7
- }
- buildbucket {
- server: "cr-buildbucket.appspot.com"
- bucket: "perf"
- builder: "Perf Android64 (M Nexus5X)"
- }
-}
-job {
id: "Perf Android64 (O Pixel2)"
realm: "perf"
acls {
diff --git a/infra/config/realms.cfg b/infra/config/realms.cfg
index c39fbdf..d21fe35 100644
--- a/infra/config/realms.cfg
+++ b/infra/config/realms.cfg
@@ -111,11 +111,8 @@
conditions {
restrict {
attribute: "scheduler.job.name"
- values: "Perf Android32 (M AOSP Nexus6)"
- values: "Perf Android32 (M Nexus5)"
values: "Perf Android32 (O Pixel2)"
values: "Perf Android32 (R Pixel5)"
- values: "Perf Android64 (M Nexus5X)"
values: "Perf Android64 (O Pixel2)"
values: "Perf Android64 (R Pixel5)"
values: "Perf Fuchsia"
diff --git a/infra/specs/client.webrtc.perf.json b/infra/specs/client.webrtc.perf.json
index 3357bf2..f7b2be8 100644
--- a/infra/specs/client.webrtc.perf.json
+++ b/infra/specs/client.webrtc.perf.json
@@ -1,166 +1,6 @@
{
"AAAAA1 AUTOGENERATED FILE DO NOT EDIT": {},
"AAAAA2 See generate_buildbot_json.py to make changes": {},
- "Perf Android32 (M AOSP Nexus6)": {
- "gtest_tests": [
- {
- "args": [
- ".",
- "--remove",
- "--android",
- "--adb-path",
- "../../third_party/android_sdk/public/platform-tools/adb",
- "--isolated-script-test-perf-output=${ISOLATED_OUTDIR}/perftest-output.pb"
- ],
- "merge": {
- "args": [
- "--test-suite",
- "low_bandwidth_audio_perf_test"
- ],
- "script": "//tools_webrtc/perf/process_perf_results.py"
- },
- "resultdb": {
- "enable": true,
- "has_native_resultdb_integration": true
- },
- "swarming": {
- "can_use_on_swarming_builders": true,
- "dimension_sets": [
- {
- "android_devices": "1",
- "device_os": "M",
- "device_type": "shamu",
- "gce": "0",
- "os": "Android",
- "pool": "WebRTC-perf"
- }
- ],
- "hard_timeout": 10800,
- "idempotent": false,
- "io_timeout": 10800,
- "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
- },
- "test": "low_bandwidth_audio_perf_test",
- "test_id_prefix": "ninja://audio:low_bandwidth_audio_perf_test/"
- },
- {
- "args": [
- "--isolated-script-test-perf-output=${ISOLATED_OUTDIR}/perftest-output.pb",
- "--nologs"
- ],
- "merge": {
- "args": [
- "--test-suite",
- "webrtc_perf_tests"
- ],
- "script": "//tools_webrtc/perf/process_perf_results.py"
- },
- "resultdb": {
- "enable": true,
- "has_native_resultdb_integration": true
- },
- "swarming": {
- "can_use_on_swarming_builders": true,
- "dimension_sets": [
- {
- "android_devices": "1",
- "device_os": "M",
- "device_type": "shamu",
- "gce": "0",
- "os": "Android",
- "pool": "WebRTC-perf"
- }
- ],
- "hard_timeout": 10800,
- "idempotent": false,
- "io_timeout": 10800,
- "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
- },
- "test": "webrtc_perf_tests",
- "test_id_prefix": "ninja://:webrtc_perf_tests/"
- }
- ]
- },
- "Perf Android32 (M Nexus5)": {
- "gtest_tests": [
- {
- "args": [
- ".",
- "--remove",
- "--android",
- "--adb-path",
- "../../third_party/android_sdk/public/platform-tools/adb",
- "--isolated-script-test-perf-output=${ISOLATED_OUTDIR}/perftest-output.pb"
- ],
- "merge": {
- "args": [
- "--test-suite",
- "low_bandwidth_audio_perf_test"
- ],
- "script": "//tools_webrtc/perf/process_perf_results.py"
- },
- "resultdb": {
- "enable": true,
- "has_native_resultdb_integration": true
- },
- "swarming": {
- "can_use_on_swarming_builders": true,
- "dimension_sets": [
- {
- "android_devices": "1",
- "device_os": "M",
- "device_type": "hammerhead",
- "gce": "0",
- "os": "Android",
- "pool": "WebRTC-perf"
- }
- ],
- "hard_timeout": 10800,
- "idempotent": false,
- "io_timeout": 10800,
- "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
- },
- "test": "low_bandwidth_audio_perf_test",
- "test_id_prefix": "ninja://audio:low_bandwidth_audio_perf_test/"
- },
- {
- "args": [
- "--isolated-script-test-perf-output=${ISOLATED_OUTDIR}/perftest-output.pb",
- "--nologs"
- ],
- "merge": {
- "args": [
- "--test-suite",
- "webrtc_perf_tests"
- ],
- "script": "//tools_webrtc/perf/process_perf_results.py"
- },
- "resultdb": {
- "enable": true,
- "has_native_resultdb_integration": true
- },
- "swarming": {
- "can_use_on_swarming_builders": true,
- "dimension_sets": [
- {
- "android_devices": "1",
- "device_os": "M",
- "device_type": "hammerhead",
- "gce": "0",
- "os": "Android",
- "pool": "WebRTC-perf"
- }
- ],
- "hard_timeout": 10800,
- "idempotent": false,
- "io_timeout": 10800,
- "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
- },
- "test": "webrtc_perf_tests",
- "test_id_prefix": "ninja://:webrtc_perf_tests/"
- }
- ]
- },
"Perf Android32 (O Pixel2)": {
"gtest_tests": [
{
@@ -317,86 +157,6 @@
}
]
},
- "Perf Android64 (M Nexus5X)": {
- "gtest_tests": [
- {
- "args": [
- ".",
- "--remove",
- "--android",
- "--adb-path",
- "../../third_party/android_sdk/public/platform-tools/adb",
- "--isolated-script-test-perf-output=${ISOLATED_OUTDIR}/perftest-output.pb"
- ],
- "merge": {
- "args": [
- "--test-suite",
- "low_bandwidth_audio_perf_test"
- ],
- "script": "//tools_webrtc/perf/process_perf_results.py"
- },
- "resultdb": {
- "enable": true,
- "has_native_resultdb_integration": true
- },
- "swarming": {
- "can_use_on_swarming_builders": true,
- "dimension_sets": [
- {
- "android_devices": "1",
- "device_os": "MMB29Q",
- "device_type": "bullhead",
- "gce": "0",
- "os": "Android",
- "pool": "WebRTC-perf"
- }
- ],
- "hard_timeout": 10800,
- "idempotent": false,
- "io_timeout": 10800,
- "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
- },
- "test": "low_bandwidth_audio_perf_test",
- "test_id_prefix": "ninja://audio:low_bandwidth_audio_perf_test/"
- },
- {
- "args": [
- "--isolated-script-test-perf-output=${ISOLATED_OUTDIR}/perftest-output.pb",
- "--nologs"
- ],
- "merge": {
- "args": [
- "--test-suite",
- "webrtc_perf_tests"
- ],
- "script": "//tools_webrtc/perf/process_perf_results.py"
- },
- "resultdb": {
- "enable": true,
- "has_native_resultdb_integration": true
- },
- "swarming": {
- "can_use_on_swarming_builders": true,
- "dimension_sets": [
- {
- "android_devices": "1",
- "device_os": "MMB29Q",
- "device_type": "bullhead",
- "gce": "0",
- "os": "Android",
- "pool": "WebRTC-perf"
- }
- ],
- "hard_timeout": 10800,
- "idempotent": false,
- "io_timeout": 10800,
- "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
- },
- "test": "webrtc_perf_tests",
- "test_id_prefix": "ninja://:webrtc_perf_tests/"
- }
- ]
- },
"Perf Android64 (O Pixel2)": {
"gtest_tests": [
{
diff --git a/infra/specs/mixins.pyl b/infra/specs/mixins.pyl
index 2f11efd..d7edb42 100644
--- a/infra/specs/mixins.pyl
+++ b/infra/specs/mixins.pyl
@@ -32,14 +32,6 @@
}
}
},
- 'bullhead': {
- 'swarming': {
- 'dimensions': {
- 'device_type': 'bullhead',
- 'os': 'Android'
- }
- }
- },
'chrome-tester-service-account': {
'swarming': {
'service_account':
@@ -59,14 +51,6 @@
}
}
},
- 'hammerhead': {
- 'swarming': {
- 'dimensions': {
- 'device_type': 'hammerhead',
- 'os': 'Android'
- }
- }
- },
'has_native_resultdb_integration': {
'resultdb': {
'enable': True,
@@ -176,20 +160,6 @@
}]
}
},
- 'marshmallow': {
- 'swarming': {
- 'dimensions': {
- 'device_os': 'MMB29Q'
- }
- }
- },
- 'marshmallow_generic': {
- 'swarming': {
- 'dimensions': {
- 'device_os': 'M'
- }
- }
- },
'out_dir_arg': {
'$mixin_append': {
'args': ['--out-dir', '${ISOLATED_OUTDIR}']
@@ -271,14 +241,6 @@
'result_format': 'json'
}
},
- 'shamu': {
- 'swarming': {
- 'dimensions': {
- 'device_type': 'shamu',
- 'os': 'Android'
- }
- }
- },
'shards-2': {
'swarming': {
'shards': 2
diff --git a/infra/specs/mixins_webrtc.pyl b/infra/specs/mixins_webrtc.pyl
index 56de235..859dfca 100644
--- a/infra/specs/mixins_webrtc.pyl
+++ b/infra/specs/mixins_webrtc.pyl
@@ -35,14 +35,6 @@
}
}
},
- 'hammerhead': {
- 'swarming': {
- 'dimensions': {
- 'device_type': 'hammerhead',
- 'os': 'Android'
- }
- }
- },
'ios-device-15.7': {
'swarming': {
'dimensions': {
@@ -129,13 +121,6 @@
}
}
},
- 'marshmallow_generic': {
- 'swarming': {
- 'dimensions': {
- 'device_os': 'M'
- }
- }
- },
'perf-fuchsia-perf-tests': {
'merge': {
'script': '//tools_webrtc/perf/process_perf_results.py',
@@ -220,14 +205,6 @@
'result_format': 'json'
}
},
- 'shamu': {
- 'swarming': {
- 'dimensions': {
- 'device_type': 'shamu',
- 'os': 'Android',
- },
- },
- },
'shards-2': {
'swarming': {
'shards': 2,
diff --git a/infra/specs/waterfalls.pyl b/infra/specs/waterfalls.pyl
index 0db19e71..9f82274 100644
--- a/infra/specs/waterfalls.pyl
+++ b/infra/specs/waterfalls.pyl
@@ -262,26 +262,6 @@
'name': 'client.webrtc.perf',
'mixins': [],
'machines': {
- 'Perf Android32 (M AOSP Nexus6)': {
- 'mixins': [
- 'shamu', 'marshmallow_generic', 'android-devices', 'perf-pool',
- 'perf-output', 'timeout-3h', 'has_native_resultdb_integration',
- 'chromium-tester-service-account'
- ],
- 'test_suites': {
- 'gtest_tests': 'android_perf_tests',
- },
- },
- 'Perf Android32 (M Nexus5)': {
- 'mixins': [
- 'hammerhead', 'marshmallow_generic', 'android-devices', 'perf-pool',
- 'perf-output', 'timeout-3h', 'has_native_resultdb_integration',
- 'chromium-tester-service-account'
- ],
- 'test_suites': {
- 'gtest_tests': 'android_perf_tests',
- },
- },
'Perf Android32 (O Pixel2)': {
'mixins': [
'walleye', 'android-devices', 'perf-pool', 'timeout-3h',
@@ -301,16 +281,6 @@
'gtest_tests': 'android_perf_tests',
},
},
- 'Perf Android64 (M Nexus5X)': {
- 'mixins': [
- 'bullhead', 'marshmallow', 'android-devices', 'perf-pool',
- 'perf-output', 'timeout-3h', 'has_native_resultdb_integration',
- 'chromium-tester-service-account'
- ],
- 'test_suites': {
- 'gtest_tests': 'android_perf_tests',
- },
- },
'Perf Android64 (O Pixel2)': {
'mixins': [
'walleye', 'android-devices', 'perf-pool', 'timeout-3h',
diff --git a/tools_webrtc/mb/mb_config.pyl b/tools_webrtc/mb/mb_config.pyl
index 138ecf2..4813a31 100644
--- a/tools_webrtc/mb/mb_config.pyl
+++ b/tools_webrtc/mb/mb_config.pyl
@@ -124,11 +124,8 @@
# build anything).
# TODO(http://crbug.com/1029452): Nuke these and isolate on builder
# instead?
- 'Perf Android32 (M AOSP Nexus6)': 'release_bot_x64',
- 'Perf Android32 (M Nexus5)': 'release_bot_x64',
'Perf Android32 (O Pixel2)': 'release_bot_x64',
'Perf Android32 (R Pixel5)': 'release_bot_x64',
- 'Perf Android64 (M Nexus5X)': 'release_bot_x64',
'Perf Android64 (O Pixel2)': 'release_bot_x64',
'Perf Android64 (R Pixel5)': 'release_bot_x64',
'Perf Fuchsia': 'release_bot_x64_fuchsia',
