Display telemetry chartjson output and result data on waterfall.

scripts/slave/recipes/chromium.expected/test_chartjson_enabled.json

Index: scripts/slave/recipes/chromium.expected/test_chartjson_enabled.json
diff --git a/scripts/slave/recipes/chromium.expected/perf_test_profile_failure.json b/scripts/slave/recipes/chromium.expected/test_chartjson_enabled.json
similarity index 79%
copy from scripts/slave/recipes/chromium.expected/perf_test_profile_failure.json
copy to scripts/slave/recipes/chromium.expected/test_chartjson_enabled.json
index c70c85a89a63c7f2a6ef701a35f6626394e39c41..691541a75c565e9ebd7f2a84e850a65485e764a3 100644
--- a/scripts/slave/recipes/chromium.expected/perf_test_profile_failure.json
+++ b/scripts/slave/recipes/chromium.expected/test_chartjson_enabled.json
@@ -146,23 +146,10 @@
       "@@@STEP_LOG_LINE@json.output@{@@@",
       "@@@STEP_LOG_LINE@json.output@  \"steps\": {@@@",
       "@@@STEP_LOG_LINE@json.output@    \"blink_perf.all.exact\": {@@@",
+      "@@@STEP_LOG_LINE@json.output@      \"chartjson_file\": true, @@@",
       "@@@STEP_LOG_LINE@json.output@      \"cmd\": \"/usr/bin/python /path/to/run_benmark --a=1 -v --b=2\", @@@",
       "@@@STEP_LOG_LINE@json.output@      \"device_affinity\": 0, @@@",
       "@@@STEP_LOG_LINE@json.output@      \"perf_dashboard_id\": \"blink_perf.all\"@@@",
-      "@@@STEP_LOG_LINE@json.output@    }, @@@",

[ghost stip (do not use), 2014/11/25 06:12:39]

I'm assuming blink_perf.all.release was deleted from an unrelated change

[shatch, 2014/11/25 14:19:48]

This is a new file, so I'm not sure why it's doing a diff.

-      "@@@STEP_LOG_LINE@json.output@    \"blink_perf.all.release\": {@@@",
-      "@@@STEP_LOG_LINE@json.output@      \"cmd\": \"/usr/bin/python /path/to/run_benmark --a=1 -v --b=2\", @@@",
-      "@@@STEP_LOG_LINE@json.output@      \"device_affinity\": 0, @@@",
-      "@@@STEP_LOG_LINE@json.output@      \"perf_dashboard_id\": \"blink_perf.all\"@@@",
-      "@@@STEP_LOG_LINE@json.output@    }, @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"dromaeo.cssqueryjquery\": {@@@",
-      "@@@STEP_LOG_LINE@json.output@      \"cmd\": \"/path/to/run_benmark\", @@@",
-      "@@@STEP_LOG_LINE@json.output@      \"device_affinity\": 1@@@",
-      "@@@STEP_LOG_LINE@json.output@    }, @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"dromaeo.cssqueryjquery.release\": {@@@",
-      "@@@STEP_LOG_LINE@json.output@      \"cmd\": \"/path/to/run_benmark\", @@@",
-      "@@@STEP_LOG_LINE@json.output@      \"device_affinity\": 1, @@@",
-      "@@@STEP_LOG_LINE@json.output@      \"perf_dashboard_id\": \"dromaeo.cssqueryjquery\"@@@",
       "@@@STEP_LOG_LINE@json.output@    }@@@",
       "@@@STEP_LOG_LINE@json.output@  }, @@@",
       "@@@STEP_LOG_LINE@json.output@  \"version\": 2@@@",
@@ -188,6 +175,8 @@
       "--perf-dashboard-id=blink_perf.all",
       "--perf-id=linux-release",
       "--test-type=blink_perf.all",
+      "--chartjson-file",
+      "/path/to/tmp/json",
       "--builder-name=Linux Perf (1)",
       "--slave-name=TestSlavename",
       "--build-number=0",
@@ -197,44 +186,10 @@
       "-v",
       "--b=2"
     ],
-    "name": "blink_perf.all.exact"
-  },
-  {
-    "allow_subannotations": true,
-    "cmd": [
-      "python",
-      "-u",
-      "[BUILD]/scripts/slave/runtest.py",
-      "--target",
-      "Release",
-      "--xvfb",
-      "--factory-properties",
-      "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"buildername\": \"Linux Perf (1)\", \"buildnumber\": 0, \"mastername\": \"chromium.perf\", \"parent_buildername\": \"Linux Builder\", \"recipe\": \"chromium\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}",
-      "--build-properties",
-      "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"buildername\": \"Linux Perf (1)\", \"buildnumber\": 0, \"mastername\": \"chromium.perf\", \"parent_buildername\": \"Linux Builder\", \"recipe\": \"chromium\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}",
-      "--annotate=graphing",
-      "--results-url=https://chromeperf.appspot.com",
-      "--perf-dashboard-id=blink_perf.all",
-      "--perf-id=linux-release",
-      "--test-type=blink_perf.all",
-      "--builder-name=Linux Perf (1)",
-      "--slave-name=TestSlavename",
-      "--build-number=0",
-      "--run-python-script",
-      "/path/to/run_benmark",
-      "--a=1",
-      "-v",
-      "--b=2"
-    ],
-    "name": "blink_perf.all.release",
+    "name": "blink_perf.all.exact",
     "~followup_annotations": [
-      "step returned non-zero exit code: 1",
-      "@@@STEP_FAILURE@@@"
+      "@@@STEP_LOG_LINE@json.output@[]@@@",
+      "@@@STEP_LOG_END@json.output@@@"
     ]
-  },
-  {
-    "name": "$final_result",
-    "reason": "1 tests failed: ['dynamic_perf_tests']",
-    "status_code": 1
   }
 ]