Index: scripts/slave/recipes/chromium.expected/full_chromium_perf_Android_Builder.json |
diff --git a/scripts/slave/recipes/chromium.expected/full_chromium_perf_Android_Builder.json b/scripts/slave/recipes/chromium.expected/full_chromium_perf_Android_Builder.json |
index 6c849f52dd6a8b7ff168b4c92351e3f5686e55ae..55f34e097340f20d21e1dffa60647025a5393941 100644 |
--- a/scripts/slave/recipes/chromium.expected/full_chromium_perf_Android_Builder.json |
+++ b/scripts/slave/recipes/chromium.expected/full_chromium_perf_Android_Builder.json |
@@ -300,6 +300,7 @@ |
"--goma-dir", |
"[CACHE]/cipd/goma", |
"--", |
+ "chrome_public_apk", |
"chromium_builder_perf" |
], |
"env": { |
@@ -692,6 +693,192 @@ |
] |
}, |
{ |
+ "cmd": [ |
+ "python", |
+ "-u", |
+ "[BUILDER_CACHE]/Android_Builder/src/build/android/test_runner.py", |
+ "perf", |
+ "--release", |
+ "--verbose", |
+ "--steps", |
+ "{\"steps\": {\"resource_sizes\": {\"archive_output_dir\": true, \"cmd\": \"build/android/resource_sizes.py '[BUILDER_CACHE]/Android_Builder/src/out/Release/apks/ChromePublic.apk' --chartjson\", \"device_affinity\": null}}, \"version\": 1}", |
+ "--blacklist-file", |
+ "[BUILDER_CACHE]/Android_Builder/src/out/bad_devices.json", |
+ "--collect-chartjson-data", |
+ "--adb-path", |
+ "[BUILDER_CACHE]/Android_Builder/src/third_party/android_tools/sdk/platform-tools/adb" |
+ ], |
+ "cwd": "[BUILDER_CACHE]/Android_Builder/src", |
+ "env": { |
+ "CHROMIUM_OUTPUT_DIR": "[BUILDER_CACHE]/Android_Builder/src/out/Release", |
+ "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json", |
+ "PATH": "[BUILDER_CACHE]/Android_Builder/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/Android_Builder/src/build/android:%(PATH)s" |
+ }, |
+ "name": "Sharded Perf Tests" |
+ }, |
+ { |
+ "cmd": [ |
+ "python", |
+ "-u", |
+ "[BUILDER_CACHE]/Android_Builder/src/build/android/test_runner.py", |
+ "perf", |
+ "--steps", |
+ "{\"steps\": {\"resource_sizes\": {\"archive_output_dir\": true, \"cmd\": \"build/android/resource_sizes.py '[BUILDER_CACHE]/Android_Builder/src/out/Release/apks/ChromePublic.apk' --chartjson\", \"device_affinity\": null}}, \"version\": 1}", |
+ "--output-json-list", |
+ "/path/to/tmp/json", |
+ "--blacklist-file", |
+ "[BUILDER_CACHE]/Android_Builder/src/out/bad_devices.json", |
+ "--adb-path", |
+ "[BUILDER_CACHE]/Android_Builder/src/third_party/android_tools/sdk/platform-tools/adb" |
+ ], |
+ "cwd": "[BUILDER_CACHE]/Android_Builder", |
+ "env": { |
+ "CHROMIUM_OUTPUT_DIR": "[BUILDER_CACHE]/Android_Builder/src/out/Release", |
+ "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json", |
+ "PATH": "[BUILDER_CACHE]/Android_Builder/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/Android_Builder/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\"], \"build_data_dir\": \"[ROOT]/build_data_dir\", \"buildername\": \"Android Builder\", \"buildnumber\": 571, \"mastername\": \"chromium.perf\", \"parent_buildername\": null, \"path_config\": \"kitchen\", \"recipe\": \"chromium\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}", |
+ "--build-properties", |
+ "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"build_data_dir\": \"[ROOT]/build_data_dir\", \"buildername\": \"Android Builder\", \"buildnumber\": 571, \"mastername\": \"chromium.perf\", \"parent_buildername\": null, \"path_config\": \"kitchen\", \"recipe\": \"chromium\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}", |
+ "--annotate=graphing", |
+ "--results-url=https://chromeperf.appspot.com", |
+ "--perf-dashboard-id=page_cycler.foo", |
+ "--perf-id=Android Builder", |
+ "--test-type=page_cycler.foo", |
+ "--step-name=page_cycler.foo", |
+ "--chartjson-file", |
+ "/path/to/tmp/json", |
+ "--builder-name=Android Builder", |
+ "--slave-name=TestSlavename", |
+ "--build-number=571", |
+ "--run-python-script", |
+ "[BUILDER_CACHE]/Android_Builder/src/build/android/test_runner.py", |
+ "perf", |
+ "--print-step", |
+ "page_cycler.foo", |
+ "--verbose", |
+ "--adb-path", |
+ "[BUILDER_CACHE]/Android_Builder/src/third_party/android_tools/sdk/platform-tools/adb", |
+ "--blacklist-file", |
+ "[BUILDER_CACHE]/Android_Builder/src/out/bad_devices.json" |
+ ], |
+ "cwd": "[BUILDER_CACHE]/Android_Builder", |
+ "env": { |
+ "CHROMIUM_OUTPUT_DIR": "[BUILDER_CACHE]/Android_Builder/src/out/Release", |
+ "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json", |
+ "PATH": "[BUILDER_CACHE]/Android_Builder/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/Android_Builder/src/build/android:%(PATH)s" |
+ }, |
+ "name": "page_cycler.foo", |
+ "~followup_annotations": [ |
+ "@@@STEP_TEXT@<br/>Device Affinity: 0<br/>@@@", |
+ "@@@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\"], \"build_data_dir\": \"[ROOT]/build_data_dir\", \"buildername\": \"Android Builder\", \"buildnumber\": 571, \"mastername\": \"chromium.perf\", \"parent_buildername\": null, \"path_config\": \"kitchen\", \"recipe\": \"chromium\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}", |
+ "--build-properties", |
+ "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"build_data_dir\": \"[ROOT]/build_data_dir\", \"buildername\": \"Android Builder\", \"buildnumber\": 571, \"mastername\": \"chromium.perf\", \"parent_buildername\": null, \"path_config\": \"kitchen\", \"recipe\": \"chromium\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}", |
+ "--annotate=graphing", |
+ "--results-url=https://chromeperf.appspot.com", |
+ "--perf-dashboard-id=perf_test.foo", |
+ "--perf-id=Android Builder", |
+ "--test-type=perf_test.foo", |
+ "--step-name=perf_test.foo", |
+ "--chartjson-file", |
+ "/path/to/tmp/json", |
+ "--builder-name=Android Builder", |
+ "--slave-name=TestSlavename", |
+ "--build-number=571", |
+ "--run-python-script", |
+ "[BUILDER_CACHE]/Android_Builder/src/build/android/test_runner.py", |
+ "perf", |
+ "--print-step", |
+ "perf_test.foo", |
+ "--verbose", |
+ "--adb-path", |
+ "[BUILDER_CACHE]/Android_Builder/src/third_party/android_tools/sdk/platform-tools/adb", |
+ "--blacklist-file", |
+ "[BUILDER_CACHE]/Android_Builder/src/out/bad_devices.json" |
+ ], |
+ "cwd": "[BUILDER_CACHE]/Android_Builder", |
+ "env": { |
+ "CHROMIUM_OUTPUT_DIR": "[BUILDER_CACHE]/Android_Builder/src/out/Release", |
+ "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json", |
+ "PATH": "[BUILDER_CACHE]/Android_Builder/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/Android_Builder/src/build/android:%(PATH)s" |
+ }, |
+ "name": "perf_test.foo", |
+ "~followup_annotations": [ |
+ "@@@STEP_TEXT@<br/>Device Affinity: 0<br/>@@@", |
+ "@@@STEP_LOG_LINE@json.output@[]@@@", |
+ "@@@STEP_LOG_END@json.output@@@" |
+ ] |
+ }, |
+ { |
+ "cmd": [ |
+ "python", |
+ "-u", |
+ "\nimport glob, os, sys\nfor report in glob.glob(sys.argv[1]):\n with open(report, 'r') as f:\n for l in f.readlines():\n print l\n os.remove(report)\n", |
+ "[BUILDER_CACHE]/Android_Builder/src/out/Release/test_logs/*.log" |
+ ], |
+ "cwd": "[BUILDER_CACHE]/Android_Builder", |
+ "env": { |
+ "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json", |
+ "PATH": "[BUILDER_CACHE]/Android_Builder/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/Android_Builder/src/build/android:%(PATH)s" |
+ }, |
+ "name": "test_report", |
+ "~followup_annotations": [ |
+ "@@@STEP_LOG_LINE@python.inline@@@@", |
+ "@@@STEP_LOG_LINE@python.inline@import glob, os, sys@@@", |
+ "@@@STEP_LOG_LINE@python.inline@for report in glob.glob(sys.argv[1]):@@@", |
+ "@@@STEP_LOG_LINE@python.inline@ with open(report, 'r') as f:@@@", |
+ "@@@STEP_LOG_LINE@python.inline@ for l in f.readlines():@@@", |
+ "@@@STEP_LOG_LINE@python.inline@ print l@@@", |
+ "@@@STEP_LOG_LINE@python.inline@ os.remove(report)@@@", |
+ "@@@STEP_LOG_END@python.inline@@@" |
+ ] |
+ }, |
+ { |
"name": "$result", |
"recipe_result": null, |
"status_code": 0 |