admin/webrtc_m130
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Reland "Remove old Nexus perf bots"

Browse Source 
This reverts commit f00483206dc3fc5d9ddc4e8822ecaba1925399ea.

Reason for revert: Attempt to reland

Original change's description:
> Revert "Remove old Nexus perf bots"
>
> This reverts commit ec609b1cdd3ffd15c45445275899cf4010285399.
>
> Reason for revert: Investigate whether the correct builder is used for Pixel devices
>
> Original change's description:
> > 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}
>
> Bug: b/236797526
> Change-Id: I3ca98ddc9a336fb91eec48d54a94ddff19038366
> No-Presubmit: true
> No-Tree-Checks: true
> No-Try: true
> Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/288240
> Commit-Queue: Björn Terelius <terelius@webrtc.org>
> Auto-Submit: Björn Terelius <terelius@webrtc.org>
> Bot-Commit: rubber-stamper@appspot.gserviceaccount.com <rubber-stamper@appspot.gserviceaccount.com>
> Cr-Commit-Position: refs/heads/main@{#38898}

Bug: b/236797526
Change-Id: I4fc2e1c1f195ce89e61f0767037b418030d94afe
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/288640
Reviewed-by: Andrey Logvin <landrey@webrtc.org>
Bot-Commit: rubber-stamper@appspot.gserviceaccount.com <rubber-stamper@appspot.gserviceaccount.com>
Reviewed-by: Jeremy Leconte <jleconte@google.com>
Reviewed-by: Christoffer Jansson <jansson@google.com>
Commit-Queue: Björn Terelius <terelius@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#38927}
This commit is contained in:
Björn Terelius 2022-12-20 12:15:54 +00:00 committed by WebRTC LUCI CQ
parent 61dfaafcb2
commit c044295ab4
11 changed files with 0 additions and 625 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
infra/config/config.star
View File

@ -715,8 +715,6 @@ android_try_job("android_arm_rel")
android_try_job("android_arm_rel_reclient", cq = {"experiment_percentage": 100}) 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_builder("Android32 Builder arm", "Android|arm|size", perf_cat = "Android|arm|Builder|", prioritized = True)
android_try_job("android_compile_arm_rel") 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 (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"]) 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) android_try_job("android_compile_arm64_dbg", cq = None)
@ -724,7 +722,6 @@ android_try_job("android_arm64_dbg", cq = None)
android_builder("Android64", "Android|arm64|rel") android_builder("Android64", "Android|arm64|rel")
android_try_job("android_arm64_rel") android_try_job("android_arm64_rel")
android_builder("Android64 Builder arm64", "Android|arm64|size", perf_cat = "Android|arm64|Builder|", prioritized = True) 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 (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"]) perf_builder("Perf Android64 (R Pixel5)", "Android|arm64|Tester|R Pixel5", triggered_by = ["Android64 Builder arm64"])
android_try_job("android_compile_arm64_rel") android_try_job("android_compile_arm64_rel")

150
infra/config/cr-buildbucket.cfg
View File

@ -2537,106 +2537,6 @@ buckets {
} }
} }
} }
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 { builders {
name: "Perf Android32 (O Pixel2)" name: "Perf Android32 (O Pixel2)"
swarming_host: "chromium-swarm.appspot.com" swarming_host: "chromium-swarm.appspot.com"
@ -2737,56 +2637,6 @@ buckets {
} }
} }
} }
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 { builders {
name: "Perf Android64 (O Pixel2)" name: "Perf Android64 (O Pixel2)"
swarming_host: "chromium-swarm.appspot.com" swarming_host: "chromium-swarm.appspot.com"

15
infra/config/luci-milo.cfg
View File

@ -294,16 +294,6 @@ consoles {
name: "buildbucket/luci.webrtc.perf/Android32 Builder arm" name: "buildbucket/luci.webrtc.perf/Android32 Builder arm"
category: "Android|arm|Builder" 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 { builders {
name: "buildbucket/luci.webrtc.perf/Perf Android32 (O Pixel2)" name: "buildbucket/luci.webrtc.perf/Perf Android32 (O Pixel2)"
category: "Android|arm|Tester" category: "Android|arm|Tester"
@ -318,11 +308,6 @@ consoles {
name: "buildbucket/luci.webrtc.perf/Android64 Builder arm64" name: "buildbucket/luci.webrtc.perf/Android64 Builder arm64"
category: "Android|arm64|Builder" category: "Android|arm64|Builder"
} }
builders {
name: "buildbucket/luci.webrtc.perf/Perf Android64 (M Nexus5X)"
category: "Android|arm64|Tester"
short_name: "M Nexus5X"
}
builders { builders {
name: "buildbucket/luci.webrtc.perf/Perf Android64 (O Pixel2)" name: "buildbucket/luci.webrtc.perf/Perf Android64 (O Pixel2)"
category: "Android|arm64|Tester" category: "Android|arm64|Tester"

66
infra/config/luci-notify.cfg
View File

@ -1261,50 +1261,6 @@ notifiers {
failed_step_regexp_exclude: ".*\\(experimental\\).*" failed_step_regexp_exclude: ".*\\(experimental\\).*"
} }
} }
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 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 { notifiers {
notifications { notifications {
on_new_status: INFRA_FAILURE on_new_status: INFRA_FAILURE
@ -1349,28 +1305,6 @@ notifiers {
repository: "https://webrtc.googlesource.com/src" 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 (M Nexus5X)"
repository: "https://webrtc.googlesource.com/src"
}
}
notifiers { notifiers {
notifications { notifications {
on_new_status: INFRA_FAILURE on_new_status: INFRA_FAILURE

54
infra/config/luci-scheduler.cfg
View File

@ -365,42 +365,6 @@ job {
builder: "MacArm64 Builder" builder: "MacArm64 Builder"
} }
} }
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 { job {
id: "Perf Android32 (O Pixel2)" id: "Perf Android32 (O Pixel2)"
realm: "perf" realm: "perf"
@ -437,24 +401,6 @@ job {
builder: "Perf Android32 (R Pixel5)" builder: "Perf Android32 (R Pixel5)"
} }
} }
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 { job {
id: "Perf Android64 (O Pixel2)" id: "Perf Android64 (O Pixel2)"
realm: "perf" realm: "perf"

3
infra/config/realms.cfg
View File

@ -111,11 +111,8 @@ realms {
conditions { conditions {
restrict { restrict {
attribute: "scheduler.job.name" attribute: "scheduler.job.name"
values: "Perf Android32 (M AOSP Nexus6)"
values: "Perf Android32 (M Nexus5)"
values: "Perf Android32 (O Pixel2)" values: "Perf Android32 (O Pixel2)"
values: "Perf Android32 (R Pixel5)" values: "Perf Android32 (R Pixel5)"
values: "Perf Android64 (M Nexus5X)"
values: "Perf Android64 (O Pixel2)" values: "Perf Android64 (O Pixel2)"
values: "Perf Android64 (R Pixel5)" values: "Perf Android64 (R Pixel5)"
values: "Perf Fuchsia" values: "Perf Fuchsia"

240
infra/specs/client.webrtc.perf.json
View File

@ -1,166 +1,6 @@
{ {
"AAAAA1 AUTOGENERATED FILE DO NOT EDIT": {}, "AAAAA1 AUTOGENERATED FILE DO NOT EDIT": {},
"AAAAA2 See generate_buildbot_json.py to make changes": {}, "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)": { "Perf Android32 (O Pixel2)": {
"gtest_tests": [ "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)": { "Perf Android64 (O Pixel2)": {
"gtest_tests": [ "gtest_tests": [
{ {

38
infra/specs/mixins.pyl
View File

@ -32,14 +32,6 @@
} }
} }
}, },
'bullhead': {
'swarming': {
'dimensions': {
'device_type': 'bullhead',
'os': 'Android'
}
}
},
'chrome-tester-service-account': { 'chrome-tester-service-account': {
'swarming': { 'swarming': {
'service_account': 'service_account':
@ -59,14 +51,6 @@
} }
} }
}, },
'hammerhead': {
'swarming': {
'dimensions': {
'device_type': 'hammerhead',
'os': 'Android'
}
}
},
'has_native_resultdb_integration': { 'has_native_resultdb_integration': {
'resultdb': { 'resultdb': {
'enable': True, 'enable': True,
@ -176,20 +160,6 @@
}] }]
} }
}, },
'marshmallow': {
'swarming': {
'dimensions': {
'device_os': 'MMB29Q'
}
}
},
'marshmallow_generic': {
'swarming': {
'dimensions': {
'device_os': 'M'
}
}
},
'out_dir_arg': { 'out_dir_arg': {
'$mixin_append': { '$mixin_append': {
'args': ['--out-dir', '${ISOLATED_OUTDIR}'] 'args': ['--out-dir', '${ISOLATED_OUTDIR}']
@ -271,14 +241,6 @@
'result_format': 'json' 'result_format': 'json'
} }
}, },
'shamu': {
'swarming': {
'dimensions': {
'device_type': 'shamu',
'os': 'Android'
}
}
},
'shards-2': { 'shards-2': {
'swarming': { 'swarming': {
'shards': 2 'shards': 2

23
infra/specs/mixins_webrtc.pyl
View File

@ -35,14 +35,6 @@
} }
} }
}, },
'hammerhead': {
'swarming': {
'dimensions': {
'device_type': 'hammerhead',
'os': 'Android'
}
}
},
'ios-device-15.7': { 'ios-device-15.7': {
'swarming': { 'swarming': {
'dimensions': { 'dimensions': {
@ -129,13 +121,6 @@
} }
} }
}, },
'marshmallow_generic': {
'swarming': {
'dimensions': {
'device_os': 'M'
}
}
},
'perf-fuchsia-perf-tests': { 'perf-fuchsia-perf-tests': {
'merge': { 'merge': {
'script': '//tools_webrtc/perf/process_perf_results.py', 'script': '//tools_webrtc/perf/process_perf_results.py',
@ -220,14 +205,6 @@
'result_format': 'json' 'result_format': 'json'
} }
}, },
'shamu': {
'swarming': {
'dimensions': {
'device_type': 'shamu',
'os': 'Android',
},
},
},
'shards-2': { 'shards-2': {
'swarming': { 'swarming': {
'shards': 2, 'shards': 2,

30
infra/specs/waterfalls.pyl
View File

@ -262,26 +262,6 @@
'name': 'client.webrtc.perf', 'name': 'client.webrtc.perf',
'mixins': [], 'mixins': [],
'machines': { '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)': { 'Perf Android32 (O Pixel2)': {
'mixins': [ 'mixins': [
'walleye', 'android-devices', 'perf-pool', 'timeout-3h', 'walleye', 'android-devices', 'perf-pool', 'timeout-3h',
@ -301,16 +281,6 @@
'gtest_tests': 'android_perf_tests', '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)': { 'Perf Android64 (O Pixel2)': {
'mixins': [ 'mixins': [
'walleye', 'android-devices', 'perf-pool', 'timeout-3h', 'walleye', 'android-devices', 'perf-pool', 'timeout-3h',

3
tools_webrtc/mb/mb_config.pyl
View File

@ -124,11 +124,8 @@
# build anything). # build anything).
# TODO(http://crbug.com/1029452): Nuke these and isolate on builder # TODO(http://crbug.com/1029452): Nuke these and isolate on builder
# instead? # 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 (O Pixel2)': 'release_bot_x64',
'Perf Android32 (R Pixel5)': '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 (O Pixel2)': 'release_bot_x64',
'Perf Android64 (R Pixel5)': 'release_bot_x64', 'Perf Android64 (R Pixel5)': 'release_bot_x64',
'Perf Fuchsia': 'release_bot_x64_fuchsia', 'Perf Fuchsia': 'release_bot_x64_fuchsia',