Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(885)

Unified Diff: scripts/slave/recipes/cronet.expected/android_cronet_data_reduction_proxy_builder.json

Issue 2238243003: Merge method_counts into resource_sizes (Closed) Base URL: https://chromium.googlesource.com/chromium/tools/build.git@master
Patch Set: split adding resource_sizes to perf bot into a separate change Created 4 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: scripts/slave/recipes/cronet.expected/android_cronet_data_reduction_proxy_builder.json
diff --git a/scripts/slave/recipes/cronet.expected/android_cronet_data_reduction_proxy_builder.json b/scripts/slave/recipes/cronet.expected/android_cronet_data_reduction_proxy_builder.json
index 82dbef8c7dff1e45a181bbc53af9e0bfb2d7a837..4342d29ad59f93e5251689be4aceaef82a686a7e 100644
--- a/scripts/slave/recipes/cronet.expected/android_cronet_data_reduction_proxy_builder.json
+++ b/scripts/slave/recipes/cronet.expected/android_cronet_data_reduction_proxy_builder.json
@@ -347,6 +347,113 @@
"name": "sizes"
},
{
+ "cmd": [
+ "python",
+ "-u",
+ "[SLAVE_BUILD]/src/build/android/test_runner.py",
+ "perf",
+ "--release",
+ "--verbose",
+ "--steps",
+ "{\"steps\": {\"resource_sizes\": {\"archive_output_dir\": true, \"cmd\": \"build/android/resource_sizes.py '[SLAVE_BUILD]/src/out/Release/apks/CronetSample.apk'\", \"device_affinity\": null}}, \"version\": 1}",
+ "--blacklist-file",
+ "[SLAVE_BUILD]/src/out/bad_devices.json",
+ "--adb-path",
+ "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools/adb"
+ ],
+ "cwd": "[SLAVE_BUILD]/src",
+ "env": {
+ "CHROMIUM_OUTPUT_DIR": "[SLAVE_BUILD]/src/out/Release",
+ "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
+ "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
+ },
+ "name": "Sharded Perf Tests"
+ },
+ {
+ "cmd": [
+ "python",
+ "-u",
+ "[SLAVE_BUILD]/src/build/android/test_runner.py",
+ "perf",
+ "--steps",
+ "{\"steps\": {\"resource_sizes\": {\"archive_output_dir\": true, \"cmd\": \"build/android/resource_sizes.py '[SLAVE_BUILD]/src/out/Release/apks/CronetSample.apk'\", \"device_affinity\": null}}, \"version\": 1}",
+ "--output-json-list",
+ "/path/to/tmp/json",
+ "--blacklist-file",
+ "[SLAVE_BUILD]/src/out/bad_devices.json",
+ "--adb-path",
+ "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools/adb"
+ ],
+ "env": {
+ "CHROMIUM_OUTPUT_DIR": "[SLAVE_BUILD]/src/out/Release",
+ "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
+ "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
+ },
+ "name": "get perf test list",
+ "~followup_annotations": [
+ "@@@STEP_LOG_LINE@json.output@[@@@",
+ "@@@STEP_LOG_LINE@json.output@ {@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"device_affinity\": 0, @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"end_time\": 1443438432.949711, @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"has_archive\": true, @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"test\": \"perf_test.foo\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ }, @@@",
+ "@@@STEP_LOG_LINE@json.output@ {@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"device_affinity\": 0, @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"test\": \"page_cycler.foo\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ }@@@",
+ "@@@STEP_LOG_LINE@json.output@]@@@",
+ "@@@STEP_LOG_END@json.output@@@"
+ ]
+ },
+ {
+ "allow_subannotations": true,
+ "cmd": [
+ "python",
+ "-u",
+ "RECIPE_PACKAGE_REPO[build]/scripts/slave/runtest.py",
+ "--target",
+ "Release",
+ "--test-platform",
+ "android",
+ "--no-xvfb",
+ "--factory-properties",
+ "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"branch\": \"master\", \"buildername\": \"Android Cronet Data Reduction Proxy Builder\", \"buildnumber\": 571, \"mastername\": \"chromium.testing.master\", \"project\": \"src\", \"recipe\": \"cronet\", \"repository\": \"https://chromium.googlesource.com/chromium/src\", \"revision\": \"4f4b02f6b7fa20a3a25682c457bbc8ad589c8a00\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}",
+ "--build-properties",
+ "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"branch\": \"master\", \"buildername\": \"Android Cronet Data Reduction Proxy Builder\", \"buildnumber\": 571, \"mastername\": \"chromium.testing.master\", \"project\": \"src\", \"recipe\": \"cronet\", \"repository\": \"https://chromium.googlesource.com/chromium/src\", \"revision\": \"4f4b02f6b7fa20a3a25682c457bbc8ad589c8a00\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}",
+ "--annotate=graphing",
+ "--results-url=https://chromeperf.appspot.com",
+ "--perf-dashboard-id=page_cycler.foo",
+ "--perf-id=android_cronet_data_reduction_proxy_builder",
+ "--test-type=page_cycler.foo",
+ "--step-name=page_cycler.foo",
+ "--builder-name=Android Cronet Data Reduction Proxy Builder",
+ "--slave-name=TestSlavename",
+ "--build-number=571",
+ "--run-python-script",
+ "[SLAVE_BUILD]/src/build/android/test_runner.py",
+ "perf",
+ "--print-step",
+ "page_cycler.foo",
+ "--verbose",
+ "--adb-path",
+ "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools/adb",
+ "--blacklist-file",
+ "[SLAVE_BUILD]/src/out/bad_devices.json"
+ ],
+ "env": {
+ "CHROMIUM_OUTPUT_DIR": "[SLAVE_BUILD]/src/out/Release",
+ "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
+ "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
+ },
+ "name": "page_cycler.foo",
+ "~followup_annotations": [
+ "@@@STEP_TEXT@<br/>Device Affinity: 0<br/>@@@",
+ "@@@STEP_LOG_LINE@device affinity@0@@@",
+ "@@@STEP_LOG_END@device affinity@@@"
+ ]
+ },
+ {
"allow_subannotations": true,
"cmd": [
"python",
@@ -363,18 +470,35 @@
"{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"branch\": \"master\", \"buildername\": \"Android Cronet Data Reduction Proxy Builder\", \"buildnumber\": 571, \"mastername\": \"chromium.testing.master\", \"project\": \"src\", \"recipe\": \"cronet\", \"repository\": \"https://chromium.googlesource.com/chromium/src\", \"revision\": \"4f4b02f6b7fa20a3a25682c457bbc8ad589c8a00\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}",
"--annotate=graphing",
"--results-url=https://chromeperf.appspot.com",
- "--perf-dashboard-id=java_method_count",
+ "--perf-dashboard-id=perf_test.foo",
"--perf-id=android_cronet_data_reduction_proxy_builder",
- "--test-type=java_method_count",
- "--step-name=method_count",
+ "--test-type=perf_test.foo",
+ "--step-name=perf_test.foo",
"--builder-name=Android Cronet Data Reduction Proxy Builder",
"--slave-name=TestSlavename",
"--build-number=571",
"--run-python-script",
- "[SLAVE_BUILD]/src/build/android/method_count.py",
- "[SLAVE_BUILD]/src/out/Release/apks/CronetSample.apk"
+ "[SLAVE_BUILD]/src/build/android/test_runner.py",
+ "perf",
+ "--print-step",
+ "perf_test.foo",
+ "--verbose",
+ "--adb-path",
+ "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools/adb",
+ "--blacklist-file",
+ "[SLAVE_BUILD]/src/out/bad_devices.json"
],
- "name": "method_count"
+ "env": {
+ "CHROMIUM_OUTPUT_DIR": "[SLAVE_BUILD]/src/out/Release",
+ "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
+ "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
+ },
+ "name": "perf_test.foo",
+ "~followup_annotations": [
+ "@@@STEP_TEXT@<br/>Device Affinity: 0<br/>@@@",
+ "@@@STEP_LOG_LINE@device affinity@0@@@",
+ "@@@STEP_LOG_END@device affinity@@@"
+ ]
},
{
"cmd": [

Powered by Google App Engine
This is Rietveld 408576698