Fix missing perftest-output.pb file for Android perf bots.
Bug: webrtc:13899
Change-Id: Ica8fe3f90a80c79b5cd53b755cc0761292664547
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/258403
Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org>
Commit-Queue: Jeremy Leconte <jleconte@google.com>
Cr-Commit-Position: refs/heads/main@{#36507}
diff --git a/infra/specs/client.webrtc.perf.json b/infra/specs/client.webrtc.perf.json
index 99ebb3b..cc48da3 100644
--- a/infra/specs/client.webrtc.perf.json
+++ b/infra/specs/client.webrtc.perf.json
@@ -7,7 +7,8 @@
"args": [
"--android",
"--adb-path",
- "../../third_party/android_sdk/public/platform-tools/adb"
+ "../../third_party/android_sdk/public/platform-tools/adb",
+ "--isolated-script-test-perf-output=${ISOLATED_OUTDIR}/perftest-output.pb"
],
"merge": {
"args": [
@@ -39,6 +40,7 @@
},
{
"args": [
+ "--isolated-script-test-perf-output=${ISOLATED_OUTDIR}/perftest-output.pb",
"--nologs"
],
"merge": {
@@ -77,7 +79,8 @@
"args": [
"--android",
"--adb-path",
- "../../third_party/android_sdk/public/platform-tools/adb"
+ "../../third_party/android_sdk/public/platform-tools/adb",
+ "--isolated-script-test-perf-output=${ISOLATED_OUTDIR}/perftest-output.pb"
],
"merge": {
"args": [
@@ -109,6 +112,7 @@
},
{
"args": [
+ "--isolated-script-test-perf-output=${ISOLATED_OUTDIR}/perftest-output.pb",
"--nologs"
],
"merge": {
@@ -147,7 +151,8 @@
"args": [
"--android",
"--adb-path",
- "../../third_party/android_sdk/public/platform-tools/adb"
+ "../../third_party/android_sdk/public/platform-tools/adb",
+ "--isolated-script-test-perf-output=${ISOLATED_OUTDIR}/perftest-output.pb"
],
"merge": {
"args": [
@@ -179,6 +184,7 @@
},
{
"args": [
+ "--isolated-script-test-perf-output=${ISOLATED_OUTDIR}/perftest-output.pb",
"--nologs"
],
"merge": {
@@ -217,7 +223,8 @@
"args": [
"--android",
"--adb-path",
- "../../third_party/android_sdk/public/platform-tools/adb"
+ "../../third_party/android_sdk/public/platform-tools/adb",
+ "--isolated-script-test-perf-output=${ISOLATED_OUTDIR}/perftest-output.pb"
],
"merge": {
"args": [
@@ -248,6 +255,7 @@
},
{
"args": [
+ "--isolated-script-test-perf-output=${ISOLATED_OUTDIR}/perftest-output.pb",
"--nologs"
],
"merge": {
diff --git a/infra/specs/mixins.pyl b/infra/specs/mixins.pyl
index 2ce49eb..6fd6e3b 100644
--- a/infra/specs/mixins.pyl
+++ b/infra/specs/mixins.pyl
@@ -218,6 +218,13 @@
'args': ['--test-suite', 'low_bandwidth_audio_perf_test']
}
},
+ 'perf-output': {
+ '$mixin_append': {
+ 'args': [
+ '--isolated-script-test-perf-output=${ISOLATED_OUTDIR}/perftest-output.pb'
+ ]
+ }
+ },
'perf-pool': {
'swarming': {
'dimensions': {
diff --git a/infra/specs/mixins_webrtc.pyl b/infra/specs/mixins_webrtc.pyl
index 7dc911f..6037e4f 100644
--- a/infra/specs/mixins_webrtc.pyl
+++ b/infra/specs/mixins_webrtc.pyl
@@ -160,6 +160,13 @@
'args': ['--test-suite', 'low_bandwidth_audio_perf_test'],
},
},
+ 'perf-output': {
+ '$mixin_append': {
+ 'args': [
+ '--isolated-script-test-perf-output=${ISOLATED_OUTDIR}/perftest-output.pb',
+ ],
+ },
+ },
'perf-pool': {
'swarming': {
'dimensions': {
diff --git a/infra/specs/waterfalls.pyl b/infra/specs/waterfalls.pyl
index 11a12cb..3f1db3e 100644
--- a/infra/specs/waterfalls.pyl
+++ b/infra/specs/waterfalls.pyl
@@ -257,7 +257,7 @@
'Perf Android32 (M AOSP Nexus6)': {
'mixins': [
'shamu', 'marshmallow_generic', 'android-devices', 'perf-pool',
- 'timeout-3h', 'has_native_resultdb_integration'
+ 'perf-output', 'timeout-3h', 'has_native_resultdb_integration'
],
'test_suites': {
'gtest_tests': 'android_perf_tests',
@@ -266,7 +266,7 @@
'Perf Android32 (M Nexus5)': {
'mixins': [
'hammerhead', 'marshmallow_generic', 'android-devices', 'perf-pool',
- 'timeout-3h', 'has_native_resultdb_integration'
+ 'perf-output', 'timeout-3h', 'has_native_resultdb_integration'
],
'test_suites': {
'gtest_tests': 'android_perf_tests',
@@ -275,7 +275,7 @@
'Perf Android64 (M Nexus5X)': {
'mixins': [
'bullhead', 'marshmallow', 'android-devices', 'perf-pool',
- 'timeout-3h', 'has_native_resultdb_integration'
+ 'perf-output', 'timeout-3h', 'has_native_resultdb_integration'
],
'test_suites': {
'gtest_tests': 'android_perf_tests',
@@ -284,7 +284,7 @@
'Perf Android64 (O Pixel2)': {
'mixins': [
'walleye', 'android-devices', 'perf-pool', 'timeout-3h',
- 'has_native_resultdb_integration'
+ 'perf-output', 'has_native_resultdb_integration'
],
'test_suites': {
'gtest_tests': 'android_perf_tests',
