Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(88)

Side by Side Diff: scripts/slave/recipes/android/perf.expected/full_chromium_perf_android_nexus5_oilpan_perf.json

Issue 815213002: Cause chromium_android recipe to consume device_status_check's json. (Closed) Base URL: https://chromium.googlesource.com/chromium/tools/build.git@master
Patch Set: Add missing files Created 6 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 [ 1 [
2 { 2 {
3 "cmd": [ 3 "cmd": [
4 "python", 4 "python",
5 "-u", 5 "-u",
6 "[BUILD]/scripts/slave/bot_update.py", 6 "[BUILD]/scripts/slave/bot_update.py",
7 "--master", 7 "--master",
8 "chromium.perf", 8 "chromium.perf",
9 "--builder", 9 "--builder",
10 "android_nexus5_oilpan_perf", 10 "android_nexus5_oilpan_perf",
(...skipping 105 matching lines...) Expand 10 before | Expand all | Expand 10 after
116 "[SLAVE_BUILD]/src/build/android/adb_logcat_monitor.py", 116 "[SLAVE_BUILD]/src/build/android/adb_logcat_monitor.py",
117 "[SLAVE_BUILD]/src/out/logcat" 117 "[SLAVE_BUILD]/src/out/logcat"
118 ], 118 ],
119 "env": { 119 "env": {
120 "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[S LAVE_BUILD]/src/build/android:%(PATH)s" 120 "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[S LAVE_BUILD]/src/build/android:%(PATH)s"
121 }, 121 },
122 "name": "spawn_logcat_monitor" 122 "name": "spawn_logcat_monitor"
123 }, 123 },
124 { 124 {
125 "cmd": [ 125 "cmd": [
126 "[SLAVE_BUILD]/src/build/android/buildbot/bb_device_status_check.py" 126 "[SLAVE_BUILD]/src/build/android/buildbot/bb_device_status_check.py",
127 "--json-output",
128 "/path/to/tmp/json"
127 ], 129 ],
128 "env": { 130 "env": {
129 "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[S LAVE_BUILD]/src/build/android:%(PATH)s" 131 "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[S LAVE_BUILD]/src/build/android:%(PATH)s"
130 }, 132 },
131 "name": "device_status_check" 133 "name": "device_status_check",
134 "~followup_annotations": [
135 "@@@STEP_LOG_LINE@json.output@[@@@",
136 "@@@STEP_LOG_LINE@json.output@ {@@@",
137 "@@@STEP_LOG_LINE@json.output@ \"battery\": {@@@",
138 "@@@STEP_LOG_LINE@json.output@ \"AC powered\": \"false\", @@@",
139 "@@@STEP_LOG_LINE@json.output@ \"USB powered\": \"true\", @@@",
140 "@@@STEP_LOG_LINE@json.output@ \"Wireless powered\": \"false\", @@@",
141 "@@@STEP_LOG_LINE@json.output@ \"health\": \"2\", @@@",
142 "@@@STEP_LOG_LINE@json.output@ \"level\": \"100\", @@@",
143 "@@@STEP_LOG_LINE@json.output@ \"present\": \"true\", @@@",
144 "@@@STEP_LOG_LINE@json.output@ \"scale\": \"100\", @@@",
145 "@@@STEP_LOG_LINE@json.output@ \"status\": \"5\", @@@",
146 "@@@STEP_LOG_LINE@json.output@ \"technology\": \"Li-ion\", @@@",
147 "@@@STEP_LOG_LINE@json.output@ \"temperature\": \"249\", @@@",
148 "@@@STEP_LOG_LINE@json.output@ \"voltage\": \"4286\"@@@",
149 "@@@STEP_LOG_LINE@json.output@ }, @@@",
150 "@@@STEP_LOG_LINE@json.output@ \"build\": \"LRX21O\", @@@",
151 "@@@STEP_LOG_LINE@json.output@ \"build_detail\": \"google/razor/flo:5.0 /LRX21O/1570415:userdebug/dev-keys\", @@@",
152 "@@@STEP_LOG_LINE@json.output@ \"imei_slice\": \"Unknown\", @@@",
153 "@@@STEP_LOG_LINE@json.output@ \"serial\": \"07a00ca4\", @@@",
154 "@@@STEP_LOG_LINE@json.output@ \"type\": \"flo\", @@@",
155 "@@@STEP_LOG_LINE@json.output@ \"wifi_ip\": \"\"@@@",
156 "@@@STEP_LOG_LINE@json.output@ }@@@",
157 "@@@STEP_LOG_LINE@json.output@]@@@",
158 "@@@STEP_LOG_END@json.output@@@"
159 ]
132 }, 160 },
133 { 161 {
134 "cmd": [ 162 "cmd": [
135 "python", 163 "python",
136 "-u", 164 "-u",
137 "[SLAVE_BUILD]/src/build/android/provision_devices.py", 165 "[SLAVE_BUILD]/src/build/android/provision_devices.py",
138 "-t", 166 "-t",
139 "Release" 167 "Release"
140 ], 168 ],
141 "env": { 169 "env": {
(...skipping 12 matching lines...) Expand all
154 ], 182 ],
155 "env": { 183 "env": {
156 "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[S LAVE_BUILD]/src/build/android:%(PATH)s" 184 "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[S LAVE_BUILD]/src/build/android:%(PATH)s"
157 }, 185 },
158 "name": "install ChromeShell.apk" 186 "name": "install ChromeShell.apk"
159 }, 187 },
160 { 188 {
161 "cmd": [ 189 "cmd": [
162 "python", 190 "python",
163 "-u", 191 "-u",
164 "[BUILD]/scripts/slave/recipe_modules/adb/resources/list_devices.py",
165 "['[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools/adb', 'd evices']",
166 "/path/to/tmp/json"
167 ],
168 "name": "List adb devices",
169 "~followup_annotations": [
170 "@@@STEP_LOG_LINE@json.output@[@@@",
171 "@@@STEP_LOG_LINE@json.output@ \"014E1F310401C009\", @@@",
172 "@@@STEP_LOG_LINE@json.output@ \"014E1F310401C010\"@@@",
173 "@@@STEP_LOG_LINE@json.output@]@@@",
174 "@@@STEP_LOG_END@json.output@@@"
175 ]
176 },
177 {
178 "cmd": [
179 "python",
180 "-u",
181 "[SLAVE_BUILD]/src/tools/perf/run_benchmark", 192 "[SLAVE_BUILD]/src/tools/perf/run_benchmark",
182 "list", 193 "list",
183 "--browser", 194 "--browser",
184 "android-chrome-shell", 195 "android-chrome-shell",
185 "--json-output", 196 "--json-output",
186 "/path/to/tmp/json", 197 "/path/to/tmp/json",
187 "--num-shards", 198 "--num-shards",
188 "1", 199 "1",
189 "--device", 200 "--device",
190 "014E1F310401C009" 201 "07a00ca4"
191 ], 202 ],
192 "name": "List Perf Tests", 203 "name": "List Perf Tests",
193 "~followup_annotations": [ 204 "~followup_annotations": [
194 "@@@STEP_LOG_LINE@json.output@{@@@", 205 "@@@STEP_LOG_LINE@json.output@{@@@",
195 "@@@STEP_LOG_LINE@json.output@ \"steps\": {@@@", 206 "@@@STEP_LOG_LINE@json.output@ \"steps\": {@@@",
196 "@@@STEP_LOG_LINE@json.output@ \"blink_perf.all.exact\": {@@@", 207 "@@@STEP_LOG_LINE@json.output@ \"blink_perf.all.exact\": {@@@",
197 "@@@STEP_LOG_LINE@json.output@ \"cmd\": \"/usr/bin/python /path/to/ru n_benmark --a=1 -v --b=2\", @@@", 208 "@@@STEP_LOG_LINE@json.output@ \"cmd\": \"/usr/bin/python /path/to/ru n_benmark --a=1 -v --b=2\", @@@",
198 "@@@STEP_LOG_LINE@json.output@ \"device_affinity\": 0, @@@", 209 "@@@STEP_LOG_LINE@json.output@ \"device_affinity\": 0, @@@",
199 "@@@STEP_LOG_LINE@json.output@ \"perf_dashboard_id\": \"blink_perf.al l\"@@@", 210 "@@@STEP_LOG_LINE@json.output@ \"perf_dashboard_id\": \"blink_perf.al l\"@@@",
200 "@@@STEP_LOG_LINE@json.output@ }, @@@", 211 "@@@STEP_LOG_LINE@json.output@ }, @@@",
(...skipping 184 matching lines...) Expand 10 before | Expand all | Expand 10 after
385 "@@@STEP_LOG_LINE@python.inline@import glob, os, sys@@@", 396 "@@@STEP_LOG_LINE@python.inline@import glob, os, sys@@@",
386 "@@@STEP_LOG_LINE@python.inline@for report in glob.glob(sys.argv[1]):@@@", 397 "@@@STEP_LOG_LINE@python.inline@for report in glob.glob(sys.argv[1]):@@@",
387 "@@@STEP_LOG_LINE@python.inline@ with open(report, 'r') as f:@@@", 398 "@@@STEP_LOG_LINE@python.inline@ with open(report, 'r') as f:@@@",
388 "@@@STEP_LOG_LINE@python.inline@ for l in f.readlines():@@@", 399 "@@@STEP_LOG_LINE@python.inline@ for l in f.readlines():@@@",
389 "@@@STEP_LOG_LINE@python.inline@ print l@@@", 400 "@@@STEP_LOG_LINE@python.inline@ print l@@@",
390 "@@@STEP_LOG_LINE@python.inline@ os.remove(report)@@@", 401 "@@@STEP_LOG_LINE@python.inline@ os.remove(report)@@@",
391 "@@@STEP_LOG_END@python.inline@@@" 402 "@@@STEP_LOG_END@python.inline@@@"
392 ] 403 ]
393 } 404 }
394 ] 405 ]
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698