Bug 1236947 - [tc-gip] Retrieve and store logcat r=garndt

--HG--
extra : commitid : BINHH7CH6qo
extra : histedit_source : 5ef8126d29148d211158c9160af01c3b612da43f%2C2170b5caeca4ab7e077cdc328265a0c26686099c

testing/taskcluster/tasks/phone_test.yml

@@ -1,4 +1,3 @@
-# This task is the base for most tests in gecko.
 task:
   created: '{{now}}'
   deadline: '{{#from_now}}24 hours{{/from_now}}'
@@ -29,6 +28,8 @@ task:
       GAIA_REF: '{{{gaia_ref}}}'
       GAIA_REV: '{{{gaia_rev}}}'
       TESTS_TIMEOUT_IN_MS: 30000
+      MANIFEST_PATH: gaia/source/tests/python/gaia-ui-tests/gaiatest/tests/functional/manifest.ini
+      MANIFEST_INCLUDE_EXCLUDE: b2g-dsds
 
     log: 'private/b2g/logs/live.log'
 
@@ -55,6 +56,34 @@ task:
           sims: '0'
           build: '{{{img_url}}}'
 
+    command:
+      - >
+        adb logcat
+        -H $PROXY_HOST
+        -P $ADB_PORT
+        -v threadtime
+        &> /home/worker/upload/logs/logcat.log
+        &
+
+      - >
+        gaiatest
+        --total-chunks={{total_chunks}}
+        --this-chunk={{chunk}}
+        --testvars=/home/worker/data/gaia_testvars.json
+        --testvars=/home/worker/data/device.json
+        --adb-host=$PROXY_HOST
+        --adb-port=$ADB_PORT
+        --address=$PROXY_HOST:$MARIONETTE_PORT
+        --device $SERIAL_ID
+        --xml-output=/home/worker/upload/logs/xml_output.xml
+        --log-html=/home/worker/upload/logs/index.html
+        --log-mach=-
+        --log-raw=/home/worker/upload/logs/raw.log
+        --restart
+        --timeout=$TESTS_TIMEOUT_IN_MS
+        --type=$MANIFEST_INCLUDE_EXCLUDE
+        $MANIFEST_PATH
+
   extra:
     treeherder:
       groupSymbol: tc

testing/taskcluster/tasks/tests/flame_kk_gaia_ui_test_functional.yml

@@ -13,26 +13,6 @@ task:
         phone:
           sims: '1'
 
-    command:
-      - >
-        gaiatest
-        --total-chunks={{total_chunks}}
-        --this-chunk={{chunk}}
-        --testvars=/home/worker/data/gaia_testvars.json
-        --testvars=/home/worker/data/device.json
-        --adb-host=$PROXY_HOST
-        --adb-port=$ADB_PORT
-        --address=$PROXY_HOST:$MARIONETTE_PORT
-        --device $SERIAL_ID
-        --xml-output=/home/worker/upload/logs/xml_output.xml
-        --timeout=$TESTS_TIMEOUT_IN_MS
-        --log-html=/home/worker/upload/logs/index.html
-        --restart
-        --type=b2g-dsds
-        --log-mach=-
-        --log-raw=/home/worker/upload/logs/raw.log
-        gaia/source/tests/python/gaia-ui-tests/gaiatest/tests/functional/manifest.ini
-
   extra:
     chunks:
       total: 6

testing/taskcluster/tasks/tests/flame_kk_gaia_ui_test_functional_dsds.yml

@@ -8,29 +8,14 @@ task:
   workerType: flame-kk-2-sim
 
   payload:
+    env:
+      MANIFEST_INCLUDE_EXCLUDE: b2g+dsds
+
     capabilities:
       devices:
         phone:
           sims: '2'
 
-    command:
-      - >
-        gaiatest
-        --testvars=/home/worker/data/gaia_testvars.json
-        --testvars=/home/worker/data/device.json
-        --adb-host=$PROXY_HOST
-        --adb-port=$ADB_PORT
-        --address=$PROXY_HOST:$MARIONETTE_PORT
-        --device $SERIAL_ID
-        --xml-output=/home/worker/upload/logs/xml_output.xml
-        --timeout=$TESTS_TIMEOUT_IN_MS
-        --log-html=/home/worker/upload/logs/index.html
-        --restart
-        --type=b2g+dsds
-        --log-mach=-
-        --log-raw=/home/worker/upload/logs/raw.log
-        gaia/source/tests/python/gaia-ui-tests/gaiatest/tests/functional/manifest.ini
-
   extra:
     treeherder:
       groupName: Gaia Python Integration Tests

testing/taskcluster/tasks/tests/flame_kk_gaia_ui_test_sanity.yml

@@ -9,29 +9,14 @@ task:
   retries: 0
 
   payload:
+    env:
+      MANIFEST_INCLUDE_EXCLUDE: b2g+sanity
+
     capabilities:
       devices:
         phone:
           sims: '1'
 
-    command:
-      - >
-        gaiatest
-        --testvars=/home/worker/data/gaia_testvars.json
-        --testvars=/home/worker/data/device.json
-        --adb-host=$PROXY_HOST
-        --adb-port=$ADB_PORT
-        --address=$PROXY_HOST:$MARIONETTE_PORT
-        --device $SERIAL_ID
-        --xml-output=/home/worker/upload/logs/xml_output.xml
-        --timeout=$TESTS_TIMEOUT_IN_MS
-        --log-html=/home/worker/upload/logs/index.html
-        --restart
-        --type=b2g+sanity-dsds
-        --log-mach=-
-        --log-raw=/home/worker/upload/logs/raw.log
-        gaia/source/tests/python/gaia-ui-tests/gaiatest/tests/functional/manifest.ini
-
   extra:
     treeherder:
       groupName: Gaia Python Integration Tests

testing/taskcluster/tasks/tests/flame_kk_gaia_ui_test_unit.yml

@@ -8,23 +8,8 @@ task:
   workerType: flame-kk-0-sim
 
   payload:
-    command:
-      - >
-        gaiatest
-        --testvars=/home/worker/data/gaia_testvars.json
-        --testvars=/home/worker/data/device.json
-        --adb-host=$PROXY_HOST
-        --adb-port=$ADB_PORT
-        --address=$PROXY_HOST:$MARIONETTE_PORT
-        --device $SERIAL_ID
-        --xml-output=/home/worker/upload/logs/xml_output.xml
-        --timeout=$TESTS_TIMEOUT_IN_MS
-        --log-html=/home/worker/upload/logs/index.html
-        --restart
-        --type=b2g
-        --log-mach=-
-        --log-raw=/home/worker/upload/logs/raw.log
-        gaia/source/tests/python/gaia-ui-tests/gaiatest/tests/unit/manifest.ini
+    env:
+      MANIFEST_PATH: gaia/source/tests/python/gaia-ui-tests/gaiatest/tests/unit/manifest.ini
 
   extra:
     treeherder: