Index: scripts/slave/recipes/bisection/android_bisect.expected/perf_tryjob_failed_test_android_s5_perf_cq.json |
diff --git a/scripts/slave/recipes/bisection/android_bisect.expected/perf_tryjob_failed_test_android_s5_perf_cq.json b/scripts/slave/recipes/bisection/android_bisect.expected/perf_tryjob_failed_test_android_s5_perf_cq.json |
index 59de1fe8573a82eaf54ca10c7d3efebe58e82faf..611dbe22035afe33d32a2d9add22c46768b068af 100644 |
--- a/scripts/slave/recipes/bisection/android_bisect.expected/perf_tryjob_failed_test_android_s5_perf_cq.json |
+++ b/scripts/slave/recipes/bisection/android_bisect.expected/perf_tryjob_failed_test_android_s5_perf_cq.json |
@@ -19,9 +19,9 @@ |
"--git-cache-dir", |
"[GIT_CACHE]", |
"--issue", |
- "12345", |
+ "12853011", |
"--patchset", |
- "20001", |
+ "1", |
"--rietveld_server", |
"https://codereview.chromium.org", |
"--output_json", |
@@ -378,7 +378,6 @@ |
"name": "load config", |
"~followup_annotations": [ |
"@@@STEP_LOG_LINE@json.output@{@@@", |
- "@@@STEP_LOG_LINE@json.output@ \"client_operation_id\": \"12345726327327\", @@@", |
"@@@STEP_LOG_LINE@json.output@ \"command\": \"./tools/perf/run_benchmark -v --browser=android-chrome sunspider\", @@@", |
"@@@STEP_LOG_LINE@json.output@ \"max_time_minutes\": \"25\", @@@", |
"@@@STEP_LOG_LINE@json.output@ \"metric\": \"dummy/dummy\", @@@", |
@@ -418,66 +417,6 @@ |
}, |
{ |
"cmd": [ |
- "/opt/infra-tools/buildbucket", |
- "put", |
- "--host", |
- "cr-buildbucket.appspot.com", |
- "--service-account-json", |
- "/creds/service_accounts/service-account-chromium-bisect.json", |
- "{\"bucket\": \"master.tryserver.chromium.perf\", \"client_operation_id\": \"123456\", \"parameters_json\": \"{\\\"buildername\\\": \\\"android_perf_bisect_builder\\\", \\\"properties\\\": {\\\"build_archive_url\\\": \\\"gs://chrome-perf-tryjob/android_perf_rel/full-build-linux_f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9123456.zip\\\", \\\"clobber\\\": true, \\\"issue\\\": \\\"12345\\\", \\\"parent_got_revision\\\": \\\"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\\\", \\\"patch_storage\\\": \\\"rietveld\\\", \\\"patchset\\\": \\\"20001\\\", \\\"rietveld\\\": \\\"https://codereview.chromium.org\\\"}}\", \"tags\": [\"master:tryserver.chromium.perf\", \"user_agent:recipe\"]}" |
- ], |
- "name": "buildbucket.put", |
- "stdout": "/path/to/tmp/json", |
- "~followup_annotations": [ |
- "@@@STEP_LOG_LINE@json.output@{@@@", |
- "@@@STEP_LOG_LINE@json.output@ \"results\": [@@@", |
- "@@@STEP_LOG_LINE@json.output@ {@@@", |
- "@@@STEP_LOG_LINE@json.output@ \"build\": {@@@", |
- "@@@STEP_LOG_LINE@json.output@ \"bucket\": \"user.username\", @@@", |
- "@@@STEP_LOG_LINE@json.output@ \"created_by\": \"user:username@example.com\", @@@", |
- "@@@STEP_LOG_LINE@json.output@ \"created_ts\": \"1459200369835900\", @@@", |
- "@@@STEP_LOG_LINE@json.output@ \"id\": \"9016911228971028736\", @@@", |
- "@@@STEP_LOG_LINE@json.output@ \"parameters_json\": \"{\\\"This_has_been\\\": \\\"removed\\\"}\", @@@", |
- "@@@STEP_LOG_LINE@json.output@ \"result_details_json\": \"null\", @@@", |
- "@@@STEP_LOG_LINE@json.output@ \"status\": \"SCHEDULED\", @@@", |
- "@@@STEP_LOG_LINE@json.output@ \"status_changed_ts\": \"1459200369835930\", @@@", |
- "@@@STEP_LOG_LINE@json.output@ \"updated_ts\": \"1459200369835940\", @@@", |
- "@@@STEP_LOG_LINE@json.output@ \"utcnow_ts\": \"1459200369962370\"@@@", |
- "@@@STEP_LOG_LINE@json.output@ }, @@@", |
- "@@@STEP_LOG_LINE@json.output@ \"etag\": \"\\\"8uCIh8TRuYs4vPN3iWmly9SJMqw\\\"\", @@@", |
- "@@@STEP_LOG_LINE@json.output@ \"kind\": \"buildbucket#resourcesItem\"@@@", |
- "@@@STEP_LOG_LINE@json.output@ }@@@", |
- "@@@STEP_LOG_LINE@json.output@ ]@@@", |
- "@@@STEP_LOG_LINE@json.output@}@@@", |
- "@@@STEP_LOG_END@json.output@@@" |
- ] |
- }, |
- { |
- "cmd": [ |
- "/opt/infra-tools/buildbucket", |
- "get", |
- "--host", |
- "cr-buildbucket.appspot.com", |
- "9016911228971028736" |
- ], |
- "name": "buildbucket.get", |
- "stdout": "/path/to/tmp/json", |
- "~followup_annotations": [ |
- "@@@STEP_LOG_LINE@json.output@{@@@", |
- "@@@STEP_LOG_LINE@json.output@ \"bucket\": \"master.tryserver.chromium.perf\", @@@", |
- "@@@STEP_LOG_LINE@json.output@ \"id\": \"9009962699124567824\", @@@", |
- "@@@STEP_LOG_LINE@json.output@ \"result\": \"SUCCESS\", @@@", |
- "@@@STEP_LOG_LINE@json.output@ \"status\": \"COMPLETED\", @@@", |
- "@@@STEP_LOG_LINE@json.output@ \"status_changed_utc\": \"Mon Jun 13 19:32:37 2016\", @@@", |
- "@@@STEP_LOG_LINE@json.output@ \"updated_utc\": \"Mon Jun 13 19:32:37 2016\", @@@", |
- "@@@STEP_LOG_LINE@json.output@ \"url\": \"http://build.chromium.org/p/tryserver.chromium.perf/builders/linux_perf_bisect/builds/6537\", @@@", |
- "@@@STEP_LOG_LINE@json.output@ \"utcnow_utc\": \"Tue Jun 21 21:33:56 2016\"@@@", |
- "@@@STEP_LOG_LINE@json.output@}@@@", |
- "@@@STEP_LOG_END@json.output@@@" |
- ] |
- }, |
- { |
- "cmd": [ |
"python", |
"-u", |
"\nimport os, sys\nfrom common import chromium_utils # Error? See https://crbug.com/584783.\n\n\nif os.path.exists(sys.argv[1]):\n chromium_utils.RemoveDirectory(sys.argv[1])\n", |
@@ -499,26 +438,64 @@ |
"cmd": [ |
"python", |
"-u", |
- "RECIPE_MODULE[build::gsutil]/resources/gsutil_wrapper.py", |
- "--", |
- "RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py", |
- "--force-version", |
- "4.7", |
- "----", |
- "cp", |
- "gs://chrome-perf/android_perf_rel/full-build-linux_f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9123456.zip", |
- "[SLAVE_BUILD]/src/out/build_product.zip" |
+ "[SLAVE_BUILD]/src/tools/mb/mb.py", |
+ "gen", |
+ "-m", |
+ "tryserver.chromium.perf", |
+ "-b", |
+ "android_s5_perf_cq", |
+ "--config-file", |
+ "[SLAVE_BUILD]/src/tools/mb/mb_config.pyl", |
+ "--goma-dir", |
+ "[BUILD]/goma", |
+ "//out/Release" |
], |
- "name": "gsutil download_build_product" |
+ "env": { |
+ "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json" |
+ }, |
+ "name": "generate_build_files (with patch)" |
}, |
{ |
"cmd": [ |
- "unzip", |
- "-o", |
- "[SLAVE_BUILD]/src/out/build_product.zip" |
+ "python", |
+ "-u", |
+ "RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py", |
+ "--show-path", |
+ "python", |
+ "RECIPE_PACKAGE_REPO[build]/scripts/slave/compile.py", |
+ "--gsutil-py-path", |
+ "RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py", |
+ "--ninja-path", |
+ "RECIPE_PACKAGE_REPO[depot_tools]/ninja", |
+ "--target", |
+ "Release", |
+ "--src-dir", |
+ "[SLAVE_BUILD]/src", |
+ "--goma-cache-dir", |
+ "[GOMA_CACHE]", |
+ "--build-tool", |
+ "ninja", |
+ "--compiler", |
+ "goma", |
+ "--goma-jsonstatus", |
+ "/path/to/tmp/json", |
+ "--goma-service-account-json-file", |
+ "/creds/service_accounts/service-account-goma-client.json", |
+ "--goma-dir", |
+ "[BUILD]/goma", |
+ "--goma-fail-fast", |
+ "--goma-disable-local-fallback", |
+ "--" |
], |
- "cwd": "[SLAVE_BUILD]/src", |
- "name": "unzip_build_product" |
+ "env": { |
+ "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": "compile (with patch)", |
+ "~followup_annotations": [ |
+ "@@@STEP_LOG_LINE@json.output (invalid)@null@@@", |
+ "@@@STEP_LOG_END@json.output (invalid)@@@" |
+ ] |
}, |
{ |
"cmd": [ |
@@ -558,9 +535,9 @@ |
"android", |
"--xvfb", |
"--factory-properties", |
- "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"branch\": \"\", \"buildername\": \"android_s5_perf_cq\", \"buildnumber\": 571, \"is_test\": true, \"issue\": \"12345\", \"mastername\": \"tryserver.chromium.perf\", \"patch_project\": \"chromium\", \"patch_storage\": \"rietveld\", \"patchset\": \"20001\", \"project\": \"chrome\", \"recipe\": \"bisection/android_bisect\", \"repository\": \"\", \"requester\": \"commit-bot@chromium.org\", \"revision\": \"HEAD\", \"rietveld\": \"https://codereview.chromium.org\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}", |
+ "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"branch\": \"\", \"buildername\": \"android_s5_perf_cq\", \"buildnumber\": 571, \"issue\": 12853011, \"mastername\": \"tryserver.chromium.perf\", \"patch_project\": \"chromium\", \"patchset\": 1, \"project\": \"chrome\", \"recipe\": \"bisection/android_bisect\", \"repository\": \"\", \"requester\": \"commit-bot@chromium.org\", \"revision\": \"HEAD\", \"rietveld\": \"https://codereview.chromium.org\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}", |
"--build-properties", |
- "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"branch\": \"\", \"buildername\": \"android_s5_perf_cq\", \"buildnumber\": 571, \"is_test\": true, \"issue\": \"12345\", \"mastername\": \"tryserver.chromium.perf\", \"patch_project\": \"chromium\", \"patch_storage\": \"rietveld\", \"patchset\": \"20001\", \"project\": \"chrome\", \"recipe\": \"bisection/android_bisect\", \"repository\": \"\", \"requester\": \"commit-bot@chromium.org\", \"revision\": \"HEAD\", \"rietveld\": \"https://codereview.chromium.org\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}", |
+ "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"branch\": \"\", \"buildername\": \"android_s5_perf_cq\", \"buildnumber\": 571, \"issue\": 12853011, \"mastername\": \"tryserver.chromium.perf\", \"patch_project\": \"chromium\", \"patchset\": 1, \"project\": \"chrome\", \"recipe\": \"bisection/android_bisect\", \"repository\": \"\", \"requester\": \"commit-bot@chromium.org\", \"revision\": \"HEAD\", \"rietveld\": \"https://codereview.chromium.org\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}", |
"--step-name=Performance Test (With Patch) 1 of 1", |
"--builder-name=android_s5_perf_cq", |
"--slave-name=TestSlavename", |
@@ -700,23 +677,6 @@ |
"cmd": [ |
"python", |
"-u", |
- "RECIPE_MODULE[build::gsutil]/resources/gsutil_wrapper.py", |
- "--", |
- "RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py", |
- "----", |
- "ls", |
- "gs://chrome-perf/android_perf_rel/full-build-linux_f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9.zip" |
- ], |
- "name": "gsutil exists", |
- "~followup_annotations": [ |
- "step returned non-zero exit code: 1", |
- "@@@STEP_EXCEPTION@@@" |
- ] |
- }, |
- { |
- "cmd": [ |
- "python", |
- "-u", |
"\nimport shutil, sys, os\nshutil.rmtree(sys.argv[1], True)\nshutil.rmtree(sys.argv[2], True)\ntry:\n os.remove(sys.argv[3])\nexcept OSError:\n pass\nfor base, _dirs, files in os.walk(sys.argv[4]):\n for f in files:\n if f.endswith('.pyc'):\n os.remove(os.path.join(base, f))\n", |
"[SLAVE_BUILD]/src/out/Release/debug_info_dumps", |
"[SLAVE_BUILD]/src/out/Release/test_logs", |
@@ -742,16 +702,62 @@ |
}, |
{ |
"cmd": [ |
- "/opt/infra-tools/buildbucket", |
- "put", |
- "--host", |
- "cr-buildbucket.appspot.com", |
- "--service-account-json", |
- "/creds/service_accounts/service-account-chromium-bisect.json", |
- "{\"bucket\": \"master.tryserver.chromium.perf\", \"client_operation_id\": \"123456\", \"parameters_json\": \"{\\\"buildername\\\": \\\"android_perf_bisect_builder\\\", \\\"properties\\\": {\\\"build_archive_url\\\": \\\"gs://chrome-perf/android_perf_rel/full-build-linux_f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9.zip\\\", \\\"clobber\\\": true, \\\"parent_got_revision\\\": \\\"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\\\"}}\", \"tags\": [\"master:tryserver.chromium.perf\", \"user_agent:recipe\"]}" |
+ "python", |
+ "-u", |
+ "[SLAVE_BUILD]/src/tools/mb/mb.py", |
+ "gen", |
+ "-m", |
+ "tryserver.chromium.perf", |
+ "-b", |
+ "android_s5_perf_cq", |
+ "--config-file", |
+ "[SLAVE_BUILD]/src/tools/mb/mb_config.pyl", |
+ "--goma-dir", |
+ "[BUILD]/goma", |
+ "//out/Release" |
], |
- "name": "buildbucket.put (2)", |
- "stdout": "/path/to/tmp/json", |
+ "env": { |
+ "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json" |
+ }, |
+ "name": "generate_build_files Without Patch" |
+ }, |
+ { |
+ "cmd": [ |
+ "python", |
+ "-u", |
+ "RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py", |
+ "--show-path", |
+ "python", |
+ "RECIPE_PACKAGE_REPO[build]/scripts/slave/compile.py", |
+ "--gsutil-py-path", |
+ "RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py", |
+ "--ninja-path", |
+ "RECIPE_PACKAGE_REPO[depot_tools]/ninja", |
+ "--target", |
+ "Release", |
+ "--src-dir", |
+ "[SLAVE_BUILD]/src", |
+ "--goma-cache-dir", |
+ "[GOMA_CACHE]", |
+ "--build-tool", |
+ "ninja", |
+ "--compiler", |
+ "goma", |
+ "--goma-jsonstatus", |
+ "/path/to/tmp/json", |
+ "--goma-service-account-json-file", |
+ "/creds/service_accounts/service-account-goma-client.json", |
+ "--goma-dir", |
+ "[BUILD]/goma", |
+ "--goma-fail-fast", |
+ "--goma-disable-local-fallback", |
+ "--" |
+ ], |
+ "env": { |
+ "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": "compile Without Patch", |
"~followup_annotations": [ |
"@@@STEP_LOG_LINE@json.output (invalid)@null@@@", |
"@@@STEP_LOG_END@json.output (invalid)@@@" |
@@ -761,6 +767,89 @@ |
"cmd": [ |
"python", |
"-u", |
+ "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", |
+ "[SLAVE_BUILD]/src/chrome/VERSION", |
+ "/path/to/tmp/" |
+ ], |
+ "name": "get version (2)" |
+ }, |
+ { |
+ "cmd": [ |
+ "[SLAVE_BUILD]/src/build/android/adb_install_apk.py", |
+ "ChromePublic.apk", |
+ "-v", |
+ "--blacklist-file", |
+ "[SLAVE_BUILD]/src/out/bad_devices.json", |
+ "--adb-path", |
+ "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools/adb", |
+ "--release" |
+ ], |
+ "env": { |
+ "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": "install ChromePublic.apk (2)" |
+ }, |
+ { |
+ "cmd": [ |
+ "python", |
+ "-u", |
+ "RECIPE_PACKAGE_REPO[build]/scripts/slave/runtest.py", |
+ "--target", |
+ "Release", |
+ "--test-platform", |
+ "android", |
+ "--xvfb", |
+ "--factory-properties", |
+ "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"branch\": \"\", \"buildername\": \"android_s5_perf_cq\", \"buildnumber\": 571, \"issue\": 12853011, \"mastername\": \"tryserver.chromium.perf\", \"patch_project\": \"chromium\", \"patchset\": 1, \"project\": \"chrome\", \"recipe\": \"bisection/android_bisect\", \"repository\": \"\", \"requester\": \"commit-bot@chromium.org\", \"revision\": \"HEAD\", \"rietveld\": \"https://codereview.chromium.org\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}", |
+ "--build-properties", |
+ "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"branch\": \"\", \"buildername\": \"android_s5_perf_cq\", \"buildnumber\": 571, \"issue\": 12853011, \"mastername\": \"tryserver.chromium.perf\", \"patch_project\": \"chromium\", \"patchset\": 1, \"project\": \"chrome\", \"recipe\": \"bisection/android_bisect\", \"repository\": \"\", \"requester\": \"commit-bot@chromium.org\", \"revision\": \"HEAD\", \"rietveld\": \"https://codereview.chromium.org\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}", |
+ "--step-name=Performance Test (Without Patch) 1 of 1", |
+ "--builder-name=android_s5_perf_cq", |
+ "--slave-name=TestSlavename", |
+ "--build-number=571", |
+ "--run-python-script", |
+ "[SLAVE_BUILD]/src/tools/perf/run_benchmark", |
+ "-v", |
+ "--browser=android-chrome", |
+ "sunspider", |
+ "--upload-results", |
+ "--results-label=TOT" |
+ ], |
+ "env": { |
+ "CHROMIUM_OUTPUT_DIR": "[SLAVE_BUILD]/src/out/Release" |
+ }, |
+ "name": "Performance Test (Without Patch) 1 of 1", |
+ "stderr": "/path/to/tmp/", |
+ "stdout": "/path/to/tmp/", |
+ "~followup_annotations": [ |
+ "@@@STEP_LOG_END@Captured Output@@@" |
+ ] |
+ }, |
+ { |
+ "cmd": [], |
+ "name": "Results" |
+ }, |
+ { |
+ "cmd": [ |
+ "python", |
+ "-u", |
+ "RECIPE_MODULE[build::perf_dashboard]/resources/post_json.py" |
+ ], |
+ "name": "Post bisect results", |
+ "stdin": "{\"data\": {\"bisect_bot\": \"android_s5_perf_cq\", \"buildbot_log_url\": \"http://c.org/p/cr/builders/android_s5_perf_cq/builds/571\", \"cloud_link\": \"\", \"command\": \"src/tools/perf/run_benchmark -v --browser=android-chrome sunspider\", \"metric\": \"dummy/dummy\", \"profiler_links\": [], \"status\": \"completed\", \"try_job_id\": null}, \"url\": \"https://chromeperf.appspot.com/post_bisect_results\"}", |
+ "stdout": "/path/to/tmp/json", |
+ "~followup_annotations": [ |
+ "@@@STEP_TEXT@Failed to upload result to Perf Dashboard. Error response: None@@@", |
+ "@@@STEP_LOG_LINE@json.output (invalid)@null@@@", |
+ "@@@STEP_LOG_END@json.output (invalid)@@@", |
+ "@@@STEP_FAILURE@@@" |
+ ] |
+ }, |
+ { |
+ "cmd": [ |
+ "python", |
+ "-u", |
"RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py", |
"--master", |
"tryserver.chromium.perf", |
@@ -777,9 +866,9 @@ |
"--git-cache-dir", |
"[GIT_CACHE]", |
"--issue", |
- "12345", |
+ "12853011", |
"--patchset", |
- "20001", |
+ "1", |
"--rietveld_server", |
"https://codereview.chromium.org", |
"--output_json", |
@@ -936,7 +1025,7 @@ |
"[SLAVE_BUILD]/src/chrome/VERSION", |
"/path/to/tmp/" |
], |
- "name": "get version (2)" |
+ "name": "get version (3)" |
}, |
{ |
"cmd": [ |
@@ -973,7 +1062,7 @@ |
}, |
{ |
"name": "$result", |
- "reason": "Error occurs when building None: 'NoneType' object has no attribute '__getitem__'", |
+ "reason": "Failed to upload result to Perf Dashboard. Error response: None", |
"status_code": 1 |
} |
] |