Index: scripts/slave/recipes/bisection/desktop_bisect.py |
diff --git a/scripts/slave/recipes/bisection/desktop_bisect.py b/scripts/slave/recipes/bisection/desktop_bisect.py |
index ae380429c3ba56813ebb5fad3544a83ef37e7144..9c4440333b17b14f29454ad5506adedbc72e2659 100644 |
--- a/scripts/slave/recipes/bisection/desktop_bisect.py |
+++ b/scripts/slave/recipes/bisection/desktop_bisect.py |
@@ -68,56 +68,12 @@ 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" |
-} |
- |
yield (api.test('basic_perf_tryjob') + api.properties.tryserver( |
mastername='tryserver.chromium.perf', |
- buildername='linux_perf_bisect', |
- patch_storage='rietveld', |
- patchset='20001', |
- issue='12345', |
- is_test=True, |
- rietveld="https://codereview.chromium.org") + api.override_step_data( |
+ buildername='linux_perf_bisect') + 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', |
@@ -129,24 +85,10 @@ results-without_patch |
yield (api.test('basic_perf_tryjob_with_metric') + api.properties.tryserver( |
mastername='tryserver.chromium.perf', |
- buildername='linux_perf_bisect', |
- patch_storage='rietveld', |
- patchset='20001', |
- issue='12345', |
- is_test=True, |
- rietveld="https://codereview.chromium.org") + api.override_step_data( |
+ buildername='linux_perf_bisect') + 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', |
@@ -157,24 +99,10 @@ results-without_patch |
yield (api.test('perf_tryjob_failed_test') + api.properties.tryserver( |
mastername='tryserver.chromium.perf', |
- buildername='linux_perf_bisect', |
- patch_storage='rietveld', |
- patchset='20001', |
- issue='12345', |
- is_test=True, |
- rietveld="https://codereview.chromium.org") + api.override_step_data( |
+ buildername='linux_perf_bisect') + 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 (With Patch) 1 of 1', |
retcode=1)) |
@@ -183,12 +111,7 @@ results-without_patch |
yield ( |
api.test('basic_perf_tryjob_with_revisions') + api.properties.tryserver( |
mastername='tryserver.chromium.perf', |
- buildername='linux_perf_bisect', |
- patch_storage='rietveld', |
- patchset='20001', |
- issue='12345', |
- is_test=True, |
- rietveld="https://codereview.chromium.org") + api.override_step_data( |
+ buildername='linux_perf_bisect') + 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)) + |
@@ -197,17 +120,10 @@ results-without_patch |
stdout=api.raw_io.output('hash:d49c331def2a3bbf3ddd0096eb51551155')) + |
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( |
+ stdout=api.raw_io.output('hash:bad49c331def2a3bbf3ddd0096eb51551155')) |
+ + api.step_data( |
'Performance Test (d49c331def2a3bbf3ddd0096eb51551155) 1 of 1', |
- stdout=api.raw_io.output(results_without_patch)) + |
- api.step_data( |
+ stdout=api.raw_io.output(results_without_patch)) + api.step_data( |
'Performance Test (bad49c331def2a3bbf3ddd0096eb51551155) 1 of 1', |
stdout=api.raw_io.output(results_with_patch)) + |
api.step_data('Post bisect results', |