Chromium Code Reviews| Index: scripts/slave/recipes/bisection/android_bisect.py |
| diff --git a/scripts/slave/recipes/bisection/android_bisect.py b/scripts/slave/recipes/bisection/android_bisect.py |
| index a0041e9b88bfdd10d6195f621d10764413ac2891..55ff1789ea36f08ed990f03f7e2025efe2792d04 100644 |
| --- a/scripts/slave/recipes/bisection/android_bisect.py |
| +++ b/scripts/slave/recipes/bisection/android_bisect.py |
| @@ -83,7 +83,6 @@ from recipe_engine.recipe_api import Property |
| PROPERTIES = {'mastername': Property(), 'buildername': Property(),} |
| - |
| def RunSteps(api, mastername, buildername): |
| master_dict = BUILDERS.get(mastername, {}) |
| bot_config = master_dict.get('builders', {}).get(buildername) |
| @@ -142,24 +141,71 @@ RESULT telemetry_page_measurement_results: num_errored= 0 count |
| View online at http://storage.googleapis.com/chromium-telemetry/html-results/\ |
| results-without_patch |
| """ |
| + buildbucket_put_response = { |
| + "results":[{ |
| + "build":{ |
| + "status": "SCHEDULED", |
| + "created_ts": "1459200369835900", |
| + "bucket": "user.username", |
| + "result_details_json": "null", |
| + "status_changed_ts": "1459200369835930", |
| + "created_by": "user:username@example.com", |
| + "updated_ts": "1459200369835940", |
| + "utcnow_ts": "1459200369962370", |
| + "parameters_json": "{\"This_has_been\": \"removed\"}", |
| + "id": "9016911228971028736" |
| + }, |
| + "kind": "buildbucket#resourcesItem", |
| + "etag": "\"8uCIh8TRuYs4vPN3iWmly9SJMqw\"" |
| + }] |
| + } |
| + |
| + buildbucket_get_response = { |
| + "bucket": "master.tryserver.chromium.perf", |
| + "id": "9009962699124567824", |
| + "result": "SUCCESS", |
| + "status": "COMPLETED", |
| + "status_changed_utc": "Mon Jun 13 19:32:37 2016", |
| + "updated_utc": "Mon Jun 13 19:32:37 2016", |
| + "url": "http://build.chromium.org/p/tryserver.chromium.perf/builders/linux_perf_bisect/builds/6537", |
| + "utcnow_utc": "Tue Jun 21 21:33:56 2016" |
| +} |
| + |
| for _, master_dict in BUILDERS.items(): |
| for buildername in master_dict.get('builders', {}): |
| config_json = config_json_main.copy() |
| yield (api.test('basic_' + buildername) + api.properties.tryserver( |
| - mastername='tryserver.chromium.perf', |
| - buildername=buildername) + api.override_step_data( |
| + mastername='tryserver.chromium.perf', |
| + buildername=buildername, |
| + patch_storage='rietveld', |
| + patchset='20001', |
| + issue='12345', |
| + rietveld="https://codereview.chromium.org") + api.override_step_data( |
| 'git diff to analyze patch', |
| api.raw_io.stream_output('tools/auto_bisect/bisect.cfg'))) |
| yield ( |
| api.test('basic_perf_tryjob_' + buildername) + |
| api.properties.tryserver( |
| - mastername='tryserver.chromium.perf', |
| - buildername=buildername) + api.override_step_data( |
| + mastername='tryserver.chromium.perf', |
| + buildername=buildername, |
| + patch_storage='rietveld', |
| + patchset='20001', |
| + issue='12345', |
| + rietveld="https://codereview.chromium.org") + api.override_step_data( |
| 'git diff to analyze patch', |
| api.raw_io.stream_output('tools/run-perf-test.cfg')) + |
| api.override_step_data('load config', api.json.output(config_json)) + |
| + api.step_data('gsutil exists', retcode=1) + |
| + api.step_data('buildbucket.put', |
| + stdout=api.json.output(buildbucket_put_response)) + |
| + api.step_data('buildbucket.put (2)', |
| + stdout=api.json.output(buildbucket_put_response)) + |
| + api.step_data('buildbucket.get', |
| + stdout=api.json.output(buildbucket_get_response)) + |
| + api.step_data('buildbucket.get (2)', |
| + stdout=api.json.output(buildbucket_get_response)) + |
| api.step_data('Performance Test (Without Patch) 1 of 1', |
| stdout=api.raw_io.output(str(results_without_patch))) + |
| api.step_data('Performance Test (With Patch) 1 of 1', |
| @@ -168,11 +214,24 @@ results-without_patch |
| yield (api.test('basic_perf_tryjob_with_metric_' + buildername) + |
| api.properties.tryserver( |
| - mastername='tryserver.chromium.perf', |
| - buildername=buildername) + api.override_step_data( |
| + mastername='tryserver.chromium.perf', |
| + buildername=buildername, |
| + patch_storage='rietveld', |
| + patchset='20001', |
| + issue='12345', |
| + rietveld="https://codereview.chromium.org") + api.override_step_data( |
| 'git diff to analyze patch', |
| api.raw_io.stream_output('tools/run-perf-test.cfg')) + |
| api.override_step_data('load config', api.json.output(config_json)) |
| + + api.step_data('gsutil exists', retcode=1) |
| + + api.step_data('buildbucket.put', |
| + stdout=api.json.output(buildbucket_put_response)) |
| + + api.step_data('buildbucket.put (2)', |
| + stdout=api.json.output(buildbucket_put_response)) |
| + + api.step_data('buildbucket.get', |
| + stdout=api.json.output(buildbucket_get_response)) |
| + + api.step_data('buildbucket.get (2)', |
| + stdout=api.json.output(buildbucket_get_response)) |
| + api.step_data('Performance Test (Without Patch) 1 of 1', |
| stdout=api.raw_io.output(results_without_patch)) + |
| api.step_data('Performance Test (With Patch) 1 of 1', |
| @@ -180,22 +239,34 @@ results-without_patch |
| yield (api.test('perf_tryjob_failed_test_' + buildername) + |
| api.properties.tryserver( |
| - mastername='tryserver.chromium.perf', |
| - buildername=buildername) + api.override_step_data( |
| + mastername='tryserver.chromium.perf', |
|
RobertoCN
2016/06/27 19:36:21
Nit: Alignment
Ziqi Xiong
2016/06/27 20:40:35
Done.
|
| + buildername=buildername, |
| + patch_storage='rietveld', |
| + patchset='20001', |
| + issue='12345', |
| + rietveld="https://codereview.chromium.org") + api.override_step_data( |
| 'git diff to analyze patch', |
| api.raw_io.stream_output('tools/run-perf-test.cfg')) + |
|
RobertoCN
2016/06/27 19:36:21
Nit: let's make this consistent. Either plus at th
Ziqi Xiong
2016/06/27 20:40:35
Done.
|
| - api.override_step_data('load config', api.json.output(config_json)) |
| - + api.step_data('Performance Test (With Patch) 1 of 1', |
| - retcode=1)) |
| + api.override_step_data('load config', api.json.output(config_json)) |
| + + api.step_data('gsutil exists', retcode=1) |
| + + api.step_data('buildbucket.put', |
| + stdout=api.json.output(buildbucket_put_response)) |
| + + api.step_data('buildbucket.get', |
| + stdout=api.json.output(buildbucket_get_response)) |
| + + api.step_data('Performance Test (With Patch) 1 of 1', retcode=1)) |
| config_json.update({'good_revision': '306475', |
| 'bad_revision': '306476'}) |
| yield ( |
| api.test('basic_perf_tryjob_with_revisions_' + buildername) + |
| api.properties.tryserver( |
| - mastername='tryserver.chromium.perf', |
| - buildername=buildername) + api.override_step_data( |
| + mastername='tryserver.chromium.perf', |
| + buildername=buildername, |
|
RobertoCN
2016/06/27 19:36:21
alignment
Ziqi Xiong
2016/06/27 20:40:35
Done.
|
| + patch_storage='rietveld', |
| + patchset='20001', |
| + issue='12345', |
| + rietveld="https://codereview.chromium.org") + api.override_step_data( |
| 'git diff to analyze patch', |
| api.raw_io.stream_output('tools/run-perf-test.cfg')) + |
| api.override_step_data('load config', api.json.output(config_json)) + |
| @@ -205,6 +276,11 @@ results-without_patch |
| api.step_data('resolving commit_pos ' + config_json['bad_revision'], |
| stdout=api.raw_io.output( |
| 'hash:bad49c331def2a3bbf3ddd0096eb51551155')) + |
| + api.step_data('gsutil exists', retcode=1) + |
| + api.step_data('buildbucket.put', |
| + stdout=api.json.output(buildbucket_put_response)) + |
| + api.step_data('buildbucket.get', |
| + stdout=api.json.output(buildbucket_get_response)) + |
| api.step_data( |
| 'Performance Test (d49c331def2a3bbf3ddd0096eb51551155) 1 of 1', |
| stdout=api.raw_io.output(results_without_patch)) + |