Refactoring scripts that wait for buildbot jobs to complete.

scripts/slave/recipe_modules/auto_bisect/example.expected/basic_bisect_script.json

 [
   {
     "cmd": [
       "git",
       "update-ref",
       "refs/heads/master",
       "refs/remotes/origin/master"
     ],
     "cwd": "[TMP_BASE]/fake_checkout_tmp_1",
     "name": "git update-ref"
@@ skipping 202 matching lines @@
       "/dev/null"
     ],
     "cwd": "[TMP_BASE]/fake_checkout_tmp_1",
     "name": "Requesting build for 00316c9ddfb9d7b4e1ed2fff9fe6d964d2111111 via git try."
   },
   {
     "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",
-      "gs://chrome-perf/Linux Builder/full-build-linux_a6298e4afedbf2cd461755ea6f45b0ad64222222.zip",
-      "bb:tryserver.chromium.perf:linux_perf_bisect_builder:00316c9ddfb9d7b4e1ed2fff9fe6d964d2111111-build",
-      "bb:tryserver.chromium.perf:linux_perf_bisect_builder:a6298e4afedbf2cd461755ea6f45b0ad64222222-build",
-      "--timeout=7200"
+      "[DEPOT_TOOLS]/gsutil.py"
     ],
     "cwd": "[SLAVE_BUILD]",
     "name": "Waiting for revision 314015 and 1 other revision(s).",
-    "stdout": "/path/to/tmp/"
+    "stdin": "{\"jobs\": [{\"builder\": \"linux_perf_bisect_builder\", \"job_name\": \"a6298e4afedbf2cd461755ea6f45b0ad64222222-build\", \"master\": \"tryserver.chromium.perf\", \"type\": \"buildbot\"}, {\"builder\": \"linux_perf_bisect_builder\", \"job_name\": \"00316c9ddfb9d7b4e1ed2fff9fe6d964d2111111-build\", \"master\": \"tryserver.chromium.perf\", \"type\": \"buildbot\"}, {\"location\": \"gs://chrome-perf/Linux Builder/full-build-linux_a6298e4afedbf2cd461755ea6f45b0ad64222222.zip\", \"type\": \"gs\"}, {\"location\": \"gs://chrome-perf/Linux Builder/full-build-linux_00316c9ddfb9d7b4e1ed2fff9fe6d964d2111111.zip\", \"type\": \"gs\"}]}",
+    "stdout": "/path/to/tmp/json",
+    "~followup_annotations": [
+      "@@@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",
       "3.25",
@@ skipping 66 matching lines @@
           "revision": "00316c9ddfb9d7b4e1ed2fff9fe6d964d2111111"
         }
       }
     ]
   },
   {
     "cmd": [
       "python",
       "-u",
       "RECIPE_MODULE[auto_bisect]/resources/wait_for_any.py",
-      "[DEPOT_TOOLS]/gsutil.py",
-      "gs://chrome-perf/bisect-results/00316c9ddfb9d7b4e1ed2fff9fe6d964d2111111-test.results",
-      "gs://chrome-perf/bisect-results/a6298e4afedbf2cd461755ea6f45b0ad64222222-test.results",
-      "bb:tryserver.chromium.perf:linux_perf_tester:a6298e4afedbf2cd461755ea6f45b0ad64222222-test",
-      "bb:tryserver.chromium.perf:linux_perf_tester:00316c9ddfb9d7b4e1ed2fff9fe6d964d2111111-test",
-      "--timeout=7200"
+      "[DEPOT_TOOLS]/gsutil.py"
     ],
     "cwd": "[SLAVE_BUILD]",
     "name": "Waiting for revision 314015 and 1 other revision(s). (2)",
-    "stdout": "/path/to/tmp/"
+    "stdin": "{\"jobs\": [{\"builder\": \"linux_perf_tester\", \"job_name\": \"a6298e4afedbf2cd461755ea6f45b0ad64222222-test\", \"master\": \"tryserver.chromium.perf\", \"type\": \"buildbot\"}, {\"builder\": \"linux_perf_tester\", \"job_name\": \"00316c9ddfb9d7b4e1ed2fff9fe6d964d2111111-test\", \"master\": \"tryserver.chromium.perf\", \"type\": \"buildbot\"}, {\"location\": \"gs://chrome-perf/bisect-results/a6298e4afedbf2cd461755ea6f45b0ad64222222-test.results\", \"type\": \"gs\"}, {\"location\": \"gs://chrome-perf/bisect-results/00316c9ddfb9d7b4e1ed2fff9fe6d964d2111111-test.results\", \"type\": \"gs\"}]}",
+    "stdout": "/path/to/tmp/json",
+    "~followup_annotations": [
+      "@@@STEP_LOG_LINE@json.output@{@@@",
+      "@@@STEP_LOG_LINE@json.output@  \"completed\": [@@@",
+      "@@@STEP_LOG_LINE@json.output@    {@@@",
+      "@@@STEP_LOG_LINE@json.output@      \"location\": \"gs://chrome-perf/bisect-results/a6298e4afedbf2cd461755ea6f45b0ad64222222-test.results\", @@@",
+      "@@@STEP_LOG_LINE@json.output@      \"type\": \"gs\"@@@",
+      "@@@STEP_LOG_LINE@json.output@    }@@@",
+      "@@@STEP_LOG_LINE@json.output@  ]@@@",
+      "@@@STEP_LOG_LINE@json.output@}@@@",
+      "@@@STEP_LOG_END@json.output@@@"
+    ]
   },
   {
     "cmd": [
       "python",
       "-u",
       "RECIPE_MODULE[gsutil]/resources/gsutil_wrapper.py",
       "--",
       "[DEPOT_TOOLS]/gsutil.py",
       "--force-version",
       "3.25",
@@ skipping 19 matching lines @@
     ],
     "cwd": "[SLAVE_BUILD]",
     "name": "gsutil Get test results for build a6298e4afedbf2cd461755ea6f45b0ad64222222",
     "stdout": "/path/to/tmp/"
   },
   {
     "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": "Waiting for revision 314017",
-    "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_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",
       "3.25",
@@ skipping 55 matching lines @@
       "/dev/null"
     ],
     "cwd": "[TMP_BASE]/fake_checkout_tmp_1",
     "name": "Requesting build for dcdcdc0ff1122212323134879ddceeb1240b0988 via git try."
   },
   {
     "cmd": [
       "python",
       "-u",
       "RECIPE_MODULE[auto_bisect]/resources/wait_for_any.py",
-      "[DEPOT_TOOLS]/gsutil.py",
-      "gs://chrome-perf/Linux Builder/full-build-linux_dcdcdc0ff1122212323134879ddceeb1240b0988.zip",
-      "bb:tryserver.chromium.perf:linux_perf_bisect_builder:dcdcdc0ff1122212323134879ddceeb1240b0988-build",
-      "--timeout=7200"
+      "[DEPOT_TOOLS]/gsutil.py"
     ],
     "cwd": "[SLAVE_BUILD]",
     "name": "Waiting for revision dcdcdc0ff1122212323134879ddceeb1240b0988",
-    "stdout": "/path/to/tmp/"
+    "stdin": "{\"jobs\": [{\"builder\": \"linux_perf_bisect_builder\", \"job_name\": \"dcdcdc0ff1122212323134879ddceeb1240b0988-build\", \"master\": \"tryserver.chromium.perf\", \"type\": \"buildbot\"}, {\"location\": \"gs://chrome-perf/Linux Builder/full-build-linux_dcdcdc0ff1122212323134879ddceeb1240b0988.zip\", \"type\": \"gs\"}]}",
+    "stdout": "/path/to/tmp/json",
+    "~followup_annotations": [
+      "@@@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",
       "3.25",
@@ skipping 26 matching lines @@
           "revision": "dcdcdc0ff1122212323134879ddceeb1240b0988"
         }
       }
     ]
   },
   {
     "cmd": [
       "python",
       "-u",
       "RECIPE_MODULE[auto_bisect]/resources/wait_for_any.py",
-      "[DEPOT_TOOLS]/gsutil.py",
-      "gs://chrome-perf/bisect-results/dcdcdc0ff1122212323134879ddceeb1240b0988-test.results",
-      "bb:tryserver.chromium.perf:linux_perf_tester:dcdcdc0ff1122212323134879ddceeb1240b0988-test",
-      "--timeout=7200"
+      "[DEPOT_TOOLS]/gsutil.py"
     ],
     "cwd": "[SLAVE_BUILD]",
     "name": "Waiting for revision dcdcdc0ff1122212323134879ddceeb1240b0988 (2)",
-    "stdout": "/path/to/tmp/"
+    "stdin": "{\"jobs\": [{\"builder\": \"linux_perf_tester\", \"job_name\": \"dcdcdc0ff1122212323134879ddceeb1240b0988-test\", \"master\": \"tryserver.chromium.perf\", \"type\": \"buildbot\"}, {\"location\": \"gs://chrome-perf/bisect-results/dcdcdc0ff1122212323134879ddceeb1240b0988-test.results\", \"type\": \"gs\"}]}",
+    "stdout": "/path/to/tmp/json",
+    "~followup_annotations": [
+      "@@@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",
       "3.25",
@@ skipping 321 matching lines @@
       "/dummy/path/",
       "--path_to_goma",
       "[BUILD]/goma",
       "--build-properties",
       "{\"bisect_config\": {\"bad_revision\": \"314017\", \"bug_id\": \"\", \"builder_host\": \"master4.golo.chromium.org\", \"builder_port\": \"8341\", \"command\": \"src/tools/perf/run_benchmark -v --browser=release smoothness.tough_scrolling_cases\", \"dummy_builds\": \"True\", \"good_revision\": \"314015\", \"gs_bucket\": \"chrome-perf\", \"max_time_minutes\": \"5\", \"metric\": \"mean_input_event_latency/mean_input_event_latency\", \"recipe_tester_name\": \"linux_perf_tester\", \"repeat_count\": \"2\", \"skip_gclient_ops\": \"True\", \"test_type\": \"perf\", \"truncate_percent\": \"0\"}, \"buildername\": \"linux_perf_bisect\", \"mastername\": \"tryserver.chromium.perf\", \"recipe\": \"auto_bisect:example\", \"slavename\": \"dummyslave\"}"
     ],
     "cwd": "[SLAVE_BUILD]",
     "name": "Running Bisection"
   }
 ]