Refactoring scripts that wait for buildbot jobs to complete.

scripts/slave/recipes/bisect.expected/basic.json

 [
   {
     "cmd": [
       "python",
       "-u",
       "[BUILD]/scripts/slave/bot_update.py",
       "--master",
       "tryserver.chromium.perf",
       "--builder",
       "linux_perf_bisect_builder",
@@ skipping 375 matching lines @@
     "name": "Gathering reference values.Requesting build for a6298e4afedbf2cd461755ea6f45b0ad64222222 via git try.",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
     "cmd": [
       "python",
       "-u",
       "RECIPE_MODULE[auto_bisect]/resources/wait_for_any.py",
-      "[DEPOT_TOOLS]/gsutil.py",
-      "gs://chrome-perf/Linux Builder/full-build-linux_e28dc0d49c331def2a3bbf3ddd0096eb51551155.zip",
-      "gs://chrome-perf/Linux Builder/full-build-linux_a6298e4afedbf2cd461755ea6f45b0ad64222222.zip",
-      "bb:tryserver.chromium.perf:linux_perf_bisect_builder:a6298e4afedbf2cd461755ea6f45b0ad64222222-build",
-      "bb:tryserver.chromium.perf:linux_perf_bisect_builder:e28dc0d49c331def2a3bbf3ddd0096eb51551155-build",
-      "--timeout=7200"
+      "[DEPOT_TOOLS]/gsutil.py"
     ],
     "cwd": "[SLAVE_BUILD]",
     "name": "Gathering reference values.Waiting for revision 306475 and 1 other revision(s).",
-    "stdout": "/path/to/tmp/",
+    "stdin": "{\"jobs\": [{\"builder\": \"linux_perf_bisect_builder\", \"job_name\": \"e28dc0d49c331def2a3bbf3ddd0096eb51551155-build\", \"master\": \"tryserver.chromium.perf\", \"type\": \"buildbot\"}, {\"builder\": \"linux_perf_bisect_builder\", \"job_name\": \"a6298e4afedbf2cd461755ea6f45b0ad64222222-build\", \"master\": \"tryserver.chromium.perf\", \"type\": \"buildbot\"}, {\"location\": \"gs://chrome-perf/Linux Builder/full-build-linux_e28dc0d49c331def2a3bbf3ddd0096eb51551155.zip\", \"type\": \"gs\"}, {\"location\": \"gs://chrome-perf/Linux Builder/full-build-linux_a6298e4afedbf2cd461755ea6f45b0ad64222222.zip\", \"type\": \"gs\"}]}",
+    "stdout": "/path/to/tmp/json",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
+      "@@@STEP_NEST_LEVEL@1@@@",
+      "@@@STEP_LOG_LINE@json.output (invalid)@null@@@",
+      "@@@STEP_LOG_END@json.output (invalid)@@@"
     ]
   },
   {
     "cmd": [
       "python",
       "-u",
       "RECIPE_MODULE[gsutil]/resources/gsutil_wrapper.py",
       "--",
       "[DEPOT_TOOLS]/gsutil.py",
       "--force-version",
@@ skipping 79 matching lines @@
     ],
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
     "cmd": [
       "python",
       "-u",
       "RECIPE_MODULE[auto_bisect]/resources/wait_for_any.py",
-      "[DEPOT_TOOLS]/gsutil.py",
-      "gs://chrome-perf/bisect-results/a6298e4afedbf2cd461755ea6f45b0ad64222222-test.results",
-      "gs://chrome-perf/bisect-results/e28dc0d49c331def2a3bbf3ddd0096eb51551155-test.results",
-      "bb:tryserver.chromium.perf:linux_perf_tester:a6298e4afedbf2cd461755ea6f45b0ad64222222-test",
-      "bb:tryserver.chromium.perf:linux_perf_tester:e28dc0d49c331def2a3bbf3ddd0096eb51551155-test",
-      "--timeout=7200"
+      "[DEPOT_TOOLS]/gsutil.py"
     ],
     "cwd": "[SLAVE_BUILD]",
     "name": "Gathering reference values.Waiting for revision 306475 and 1 other revision(s). (2)",
-    "stdout": "/path/to/tmp/",
+    "stdin": "{\"jobs\": [{\"builder\": \"linux_perf_tester\", \"job_name\": \"e28dc0d49c331def2a3bbf3ddd0096eb51551155-test\", \"master\": \"tryserver.chromium.perf\", \"type\": \"buildbot\"}, {\"builder\": \"linux_perf_tester\", \"job_name\": \"a6298e4afedbf2cd461755ea6f45b0ad64222222-test\", \"master\": \"tryserver.chromium.perf\", \"type\": \"buildbot\"}, {\"location\": \"gs://chrome-perf/bisect-results/e28dc0d49c331def2a3bbf3ddd0096eb51551155-test.results\", \"type\": \"gs\"}, {\"location\": \"gs://chrome-perf/bisect-results/a6298e4afedbf2cd461755ea6f45b0ad64222222-test.results\", \"type\": \"gs\"}]}",
+    "stdout": "/path/to/tmp/json",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
+      "@@@STEP_NEST_LEVEL@1@@@",
+      "@@@STEP_LOG_LINE@json.output (invalid)@null@@@",
+      "@@@STEP_LOG_END@json.output (invalid)@@@"
     ]
   },
   {
     "cmd": [
       "python",
       "-u",
       "RECIPE_MODULE[gsutil]/resources/gsutil_wrapper.py",
       "--",
       "[DEPOT_TOOLS]/gsutil.py",
       "--force-version",
@@ skipping 26 matching lines @@
     "stdout": "/path/to/tmp/",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
     "cmd": [
       "python",
       "-u",
       "RECIPE_MODULE[auto_bisect]/resources/wait_for_any.py",
-      "[DEPOT_TOOLS]/gsutil.py",
-      "gs://chrome-perf/bisect-results/a6298e4afedbf2cd461755ea6f45b0ad64222222-test.results",
-      "bb:tryserver.chromium.perf:linux_perf_tester:a6298e4afedbf2cd461755ea6f45b0ad64222222-test",
-      "--timeout=7200"
+      "[DEPOT_TOOLS]/gsutil.py"
     ],
     "cwd": "[SLAVE_BUILD]",
     "name": "Gathering reference values.Waiting for revision src@a6298e4afedbf2cd461755ea6f45b0ad64222222",
-    "stdout": "/path/to/tmp/",
+    "stdin": "{\"jobs\": [{\"builder\": \"linux_perf_tester\", \"job_name\": \"a6298e4afedbf2cd461755ea6f45b0ad64222222-test\", \"master\": \"tryserver.chromium.perf\", \"type\": \"buildbot\"}, {\"location\": \"gs://chrome-perf/bisect-results/a6298e4afedbf2cd461755ea6f45b0ad64222222-test.results\", \"type\": \"gs\"}]}",
+    "stdout": "/path/to/tmp/json",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
+      "@@@STEP_NEST_LEVEL@1@@@",
+      "@@@STEP_LOG_LINE@json.output (invalid)@null@@@",
+      "@@@STEP_LOG_END@json.output (invalid)@@@"
     ]
   },
   {
     "cmd": [
       "python",
       "-u",
       "RECIPE_MODULE[gsutil]/resources/gsutil_wrapper.py",
       "--",
       "[DEPOT_TOOLS]/gsutil.py",
       "--force-version",
@@ skipping 98 matching lines @@
     "name": "Working on revision 00316c9ddfb9d7b4e1ed2fff9fe6d964d2111111.Requesting build for 00316c9ddfb9d7b4e1ed2fff9fe6d964d2111111 via git try.",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
     "cmd": [
       "python",
       "-u",
       "RECIPE_MODULE[auto_bisect]/resources/wait_for_any.py",
-      "[DEPOT_TOOLS]/gsutil.py",
-      "gs://chrome-perf/Linux Builder/full-build-linux_00316c9ddfb9d7b4e1ed2fff9fe6d964d2111111.zip",
-      "bb:tryserver.chromium.perf:linux_perf_bisect_builder:00316c9ddfb9d7b4e1ed2fff9fe6d964d2111111-build",
-      "--timeout=7200"
+      "[DEPOT_TOOLS]/gsutil.py"
     ],
     "cwd": "[SLAVE_BUILD]",
     "name": "Working on revision 00316c9ddfb9d7b4e1ed2fff9fe6d964d2111111.Waiting for revision 00316c9ddfb9d7b4e1ed2fff9fe6d964d2111111",
-    "stdout": "/path/to/tmp/",
+    "stdin": "{\"jobs\": [{\"builder\": \"linux_perf_bisect_builder\", \"job_name\": \"00316c9ddfb9d7b4e1ed2fff9fe6d964d2111111-build\", \"master\": \"tryserver.chromium.perf\", \"type\": \"buildbot\"}, {\"location\": \"gs://chrome-perf/Linux Builder/full-build-linux_00316c9ddfb9d7b4e1ed2fff9fe6d964d2111111.zip\", \"type\": \"gs\"}]}",
+    "stdout": "/path/to/tmp/json",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
+      "@@@STEP_NEST_LEVEL@1@@@",
+      "@@@STEP_LOG_LINE@json.output (invalid)@null@@@",
+      "@@@STEP_LOG_END@json.output (invalid)@@@"
     ]
   },
   {
     "cmd": [
       "python",
       "-u",
       "RECIPE_MODULE[gsutil]/resources/gsutil_wrapper.py",
       "--",
       "[DEPOT_TOOLS]/gsutil.py",
       "--force-version",
@@ skipping 33 matching lines @@
     ],
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
     "cmd": [
       "python",
       "-u",
       "RECIPE_MODULE[auto_bisect]/resources/wait_for_any.py",
-      "[DEPOT_TOOLS]/gsutil.py",
-      "gs://chrome-perf/bisect-results/00316c9ddfb9d7b4e1ed2fff9fe6d964d2111111-test.results",
-      "bb:tryserver.chromium.perf:linux_perf_tester:00316c9ddfb9d7b4e1ed2fff9fe6d964d2111111-test",
-      "--timeout=7200"
+      "[DEPOT_TOOLS]/gsutil.py"
     ],
     "cwd": "[SLAVE_BUILD]",
     "name": "Working on revision 00316c9ddfb9d7b4e1ed2fff9fe6d964d2111111.Waiting for revision 00316c9ddfb9d7b4e1ed2fff9fe6d964d2111111 (2)",
-    "stdout": "/path/to/tmp/",
+    "stdin": "{\"jobs\": [{\"builder\": \"linux_perf_tester\", \"job_name\": \"00316c9ddfb9d7b4e1ed2fff9fe6d964d2111111-test\", \"master\": \"tryserver.chromium.perf\", \"type\": \"buildbot\"}, {\"location\": \"gs://chrome-perf/bisect-results/00316c9ddfb9d7b4e1ed2fff9fe6d964d2111111-test.results\", \"type\": \"gs\"}]}",
+    "stdout": "/path/to/tmp/json",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
+      "@@@STEP_NEST_LEVEL@1@@@",
+      "@@@STEP_LOG_LINE@json.output (invalid)@null@@@",
+      "@@@STEP_LOG_END@json.output (invalid)@@@"
     ]
   },
   {
     "cmd": [
       "python",
       "-u",
       "RECIPE_MODULE[gsutil]/resources/gsutil_wrapper.py",
       "--",
       "[DEPOT_TOOLS]/gsutil.py",
       "--force-version",
@@ skipping 98 matching lines @@
     "name": "Working on revision fc6dfc7ff5b1073408499478969261b826441144.Requesting build for fc6dfc7ff5b1073408499478969261b826441144 via git try.",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
     "cmd": [
       "python",
       "-u",
       "RECIPE_MODULE[auto_bisect]/resources/wait_for_any.py",
-      "[DEPOT_TOOLS]/gsutil.py",
-      "gs://chrome-perf/Linux Builder/full-build-linux_fc6dfc7ff5b1073408499478969261b826441144.zip",
-      "bb:tryserver.chromium.perf:linux_perf_bisect_builder:fc6dfc7ff5b1073408499478969261b826441144-build",
-      "--timeout=7200"
+      "[DEPOT_TOOLS]/gsutil.py"
     ],
     "cwd": "[SLAVE_BUILD]",
     "name": "Working on revision fc6dfc7ff5b1073408499478969261b826441144.Waiting for revision fc6dfc7ff5b1073408499478969261b826441144",
-    "stdout": "/path/to/tmp/",
+    "stdin": "{\"jobs\": [{\"builder\": \"linux_perf_bisect_builder\", \"job_name\": \"fc6dfc7ff5b1073408499478969261b826441144-build\", \"master\": \"tryserver.chromium.perf\", \"type\": \"buildbot\"}, {\"location\": \"gs://chrome-perf/Linux Builder/full-build-linux_fc6dfc7ff5b1073408499478969261b826441144.zip\", \"type\": \"gs\"}]}",
+    "stdout": "/path/to/tmp/json",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
+      "@@@STEP_NEST_LEVEL@1@@@",
+      "@@@STEP_LOG_LINE@json.output (invalid)@null@@@",
+      "@@@STEP_LOG_END@json.output (invalid)@@@"
     ]
   },
   {
     "cmd": [
       "python",
       "-u",
       "RECIPE_MODULE[gsutil]/resources/gsutil_wrapper.py",
       "--",
       "[DEPOT_TOOLS]/gsutil.py",
       "--force-version",
@@ skipping 33 matching lines @@
     ],
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
     "cmd": [
       "python",
       "-u",
       "RECIPE_MODULE[auto_bisect]/resources/wait_for_any.py",
-      "[DEPOT_TOOLS]/gsutil.py",
-      "gs://chrome-perf/bisect-results/fc6dfc7ff5b1073408499478969261b826441144-test.results",
-      "bb:tryserver.chromium.perf:linux_perf_tester:fc6dfc7ff5b1073408499478969261b826441144-test",
-      "--timeout=7200"
+      "[DEPOT_TOOLS]/gsutil.py"
     ],
     "cwd": "[SLAVE_BUILD]",
     "name": "Working on revision fc6dfc7ff5b1073408499478969261b826441144.Waiting for revision fc6dfc7ff5b1073408499478969261b826441144 (2)",
-    "stdout": "/path/to/tmp/",
+    "stdin": "{\"jobs\": [{\"builder\": \"linux_perf_tester\", \"job_name\": \"fc6dfc7ff5b1073408499478969261b826441144-test\", \"master\": \"tryserver.chromium.perf\", \"type\": \"buildbot\"}, {\"location\": \"gs://chrome-perf/bisect-results/fc6dfc7ff5b1073408499478969261b826441144-test.results\", \"type\": \"gs\"}]}",
+    "stdout": "/path/to/tmp/json",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
+      "@@@STEP_NEST_LEVEL@1@@@",
+      "@@@STEP_LOG_LINE@json.output (invalid)@null@@@",
+      "@@@STEP_LOG_END@json.output (invalid)@@@"
     ]
   },
   {
     "cmd": [
       "python",
       "-u",
       "RECIPE_MODULE[gsutil]/resources/gsutil_wrapper.py",
       "--",
       "[DEPOT_TOOLS]/gsutil.py",
       "--force-version",
@@ skipping 57 matching lines @@
   },
   {
     "cmd": [
       "cat"
     ],
     "cwd": "[SLAVE_BUILD]",
     "name": "Results",
     "stdin": "---bisect results start here---\n\n===== BISECT JOB RESULTS =====\nStatus: Positive: A suspected commit was found.\n\nTest Command: tools/perf/run_benchmark -v --browser=release page_cycler.intl_ar_fa_he\nTest Metric: warm_times/page_load_time\nRelative Change: 75.00%\nEstimated Confidence: 99.90%\nRetested CL with revert: Not Implemented.\n\n\n===== SUSPECTED CL(s) =====\nSubject : Some random CL\nAuthor  : DummyAuthor, dummy@nowhere.com\nCommit description:\n  A long description for a CL.\nContaining multiple lines\nCommit  : 00316c9ddfb9d7b4e1ed2fff9fe6d964d2111111\nDate    : 01/01/2015\n\n\n===== TESTED REVISIONS =====\ncommit_pos revision_string                              mean_value std_err good_or_bad? tested? culprit? \n306475     306475                                       80         10      good         tested  False    \n306476     fc6dfc7ff5b1073408499478969261b826441144     70         2       good         tested  False    \n306477     00316c9ddfb9d7b4e1ed2fff9fe6d964d2111111     15         1       bad          tested  True     \n306478     src@a6298e4afedbf2cd461755ea6f45b0ad64222222 20         1       bad          tested  False    \n\n\n\n| O O | Visit http://www.chromium.org/developers/speed-infra/perf-bug-faq\n|  X  | for more information addressing perf regression bugs. For feedback,\n| / \\ | file a bug with label Cr-Tests-AutoBisect.  Thank you!"
   }
 ]