Index: tools/mb/mb.py |
diff --git a/tools/mb/mb.py b/tools/mb/mb.py |
index edbb434d27bfb36a9f3f4d1e8c0ab59231e909a3..4a294a65fb32a4c79e761cd9a99659946874d3a2 100755 |
--- a/tools/mb/mb.py |
+++ b/tools/mb/mb.py |
@@ -15,6 +15,7 @@ import argparse |
import ast |
import errno |
import json |
+import logging |
import os |
import pipes |
import pprint |
@@ -1086,23 +1087,24 @@ class MetaBuildWrapper(object): |
output_path=None) |
if android and test_type != "script": |
- logdog_command = [ |
- '--logdog-bin-cmd', './../../bin/logdog_butler', |
- '--project', 'chromium', |
- '--service-account-json', |
- '/creds/service_accounts/service-account-luci-logdog-publisher.json', |
- '--prefix', 'android/swarming/logcats/${SWARMING_TASK_ID}', |
- '--source', '${ISOLATED_OUTDIR}/logcats', |
- '--name', 'unified_logcats', |
- ] |
+ swarming_task_id = os.environ['SWARMING_TASK_ID'] |
dnj
2017/02/18 07:59:25
So I think this was a bad suggestion on my part. I
BigBossZhiling
2017/02/21 20:24:17
Done.
|
+ isolated_outdir = os.environ['ISOLATED_OUTDIR'] |
+ swarming_bot_file = os.environ['SWARMING_BOT_FILE'] |
test_cmdline = [ |
self.PathJoin('bin', 'run_%s' % target), |
- '--logcat-output-file', '${ISOLATED_OUTDIR}/logcats', |
- '--target-devices-file', '${SWARMING_BOT_FILE}', |
- '-v' |
- ] |
- cmdline = (['./../../build/android/test_wrapper/logdog_wrapper.py'] |
- + logdog_command + test_cmdline) |
+ '--logcat-output-file', '%s/logcats' % isolated_outdir, |
+ '--target-devices-file', swarming_bot_file, |
+ '-v', '--upload-full-logcat', '%s/logcats' % isolated_outdir] |
+ project = 'chromium' |
+ output = 'logdog,host=services-dot-luci-logdog.appspot.com' |
+ prefix = 'android/swarming/logcats/%s' % swarming_task_id |
+ |
+ # Call test_cmdline through logdog butler subcommand. |
+ cmdline = [ |
+ '../../bin/logdog_butler', '-project', project, |
+ '-output', output, |
+ '-prefix', prefix, |
+ 'run', '--'] + test_cmdline |
elif use_xvfb and test_type == 'windowed_test_launcher': |
extra_files = [ |
'../../testing/test_env.py', |