Logdog for logcats

tools/mb/mb.py

Index: tools/mb/mb.py
diff --git a/tools/mb/mb.py b/tools/mb/mb.py
index c21e2f10879f11ee85bc4d03fac9fbd5cfc35a13..155fa6fde8ded5b318e106bab33f5bf2ddc7c5e2 100755
--- a/tools/mb/mb.py
+++ b/tools/mb/mb.py
@@ -1010,12 +1010,24 @@ class MetaBuildWrapper(object):
     extra_files = []
 
     if android and test_type != "script":
-      cmdline = [
+      logdog_command = [
+          '--logdog-bin-cmd', './../../bin/logdog_butler',

[ghost stip (do not use), 2016/07/29 21:56:40]

CHROMIUM_SRC_DIR/bin/ ? see line 31

[nicholaslin, 2016/07/29 23:54:06]

Tried that before. That's for the buildbot slave not the swarming slave.

+          '--project', 'chromium',
+          '--logdog-server', 'luci-logdog.appspot.com',

[dnj, 2016/07/29 22:35:34]

Specifying this twice? Either use the default or remove the default value above.

[nicholaslin, 2016/07/29 23:54:06]

Removed it here.

+          '--service-account-json',
+          '/creds/service_accounts/service-account-luci-logdog-publisher.json',

[dnj, 2016/07/29 22:35:34]

Are we comfortable hardcoding this in "chromium/src"? This will also not work on
GCE, but that probably doesn't matter.

[dnj, 2016/07/30 15:47:48]

Ping on this. We're baking Infra credential paths in to "chromium/src" here. I
don't know if this is something that we want so far away from actual infra-homed
code.

Let's discuss alternatives, specifically, there is an option for me to actually
bake this into LogDog Butler itself so that neither the JSON path nor the "host"
is needed. I'll put together a CL for this, since it's something I've been
meaning to do for a while.

[nicholaslin, 2016/08/02 22:05:13]

Noted. Will think about alternatives.

+          '--prefix', 'android/swarming/logcats/${SWARMING_TASK_ID}',
+          '--source', '${ISOLATED_OUTDIR}/logcats',
+          '--name', 'unified_logcats',
+      ]
+      test_cmdline = [
           self.PathJoin('bin', 'run_%s' % target_name),
-          '--logcat-output-dir', '${ISOLATED_OUTDIR}/logcats',
+          '--logcat-output-file', '${ISOLATED_OUTDIR}/logcats',

[ghost stip (do not use), 2016/07/29 21:56:40]

unified_logcats?

[nicholaslin, 2016/07/29 23:54:06]

Done.

Do we want it to be named unified logcats? The location doesn't really matter
for logdog since name overwrites the file location.

           '--target-devices-file', '${SWARMING_BOT_FILE}',
-          '-v',
+          '-v'
       ]
+      cmdline = (['./../../build/android/logdog_wrapper/logdog_test_wrapper.py']

[ghost stip (do not use), 2016/07/29 21:56:40]

os.path.join(CHROMIUM_SRC_DIR, 'build', 'android') etc

[nicholaslin, 2016/07/29 23:54:06]

see above.

+                 + logdog_command + test_cmdline)
     elif use_x11 and test_type == 'windowed_test_launcher':
       extra_files = [
           'xdisplaycheck',