Bug 1236947 - [tc-gip] Retrieve and store logcat r=garndt
☠☠ backed out by 70b3481074b0 ☠ ☠
authorJohan Lorenzo <jlorenzo@mozilla.com>
Thu, 07 Jan 2016 16:27:28 +0100
changeset 278947 9e922c947dddfa78817cf9ce4cf37fc912e7cad9
parent 278946 6232c5cef7c66907fb08c74f2ad96d7fcdb236e8
child 278948 70b3481074b0085bb0c7b9a5ebc88c921a5055ec
push id29861
push userkwierso@gmail.com
push dateThu, 07 Jan 2016 22:48:28 +0000
treeherdermozilla-central@b4d9c2dd5f7a [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersgarndt
bugs1236947
milestone46.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1236947 - [tc-gip] Retrieve and store logcat r=garndt
testing/taskcluster/tasks/phone_test.yml
testing/taskcluster/tasks/tests/flame_kk_gaia_ui_test_functional.yml
testing/taskcluster/tasks/tests/flame_kk_gaia_ui_test_functional_dsds.yml
testing/taskcluster/tasks/tests/flame_kk_gaia_ui_test_sanity.yml
testing/taskcluster/tasks/tests/flame_kk_gaia_ui_test_unit.yml
--- a/testing/taskcluster/tasks/phone_test.yml
+++ b/testing/taskcluster/tasks/phone_test.yml
@@ -1,9 +1,8 @@
-# This task is the base for most tests in gecko.
 task:
   created: '{{now}}'
   deadline: '{{#from_now}}24 hours{{/from_now}}'
   metadata:
     source: http://todo.com/soon
     owner: mozilla-taskcluster-maintenance@mozilla.com
   tags:
     createdForUser: {{owner}}
@@ -24,16 +23,18 @@ task:
       tc-vcs: '/home/worker/.tc-vcs'
     env:
       MOZ_BUILD_DATE: '{{pushdate}}'
       GAIA_HEAD_REPOSITORY: '{{{gaia_head_repository}}}'
       GAIA_BASE_REPOSITORY: '{{{gaia_base_repository}}}'
       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'
 
     # All builds share a common artifact directory for ease of uploading.
     artifacts:
       'private/b2g/device.json':
         type: file
         path: '/home/worker/data/device.json'
@@ -50,15 +51,43 @@ task:
     capabilities:
       devices:
         phone:
           type: 'flame'
           memory: '512'
           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
       groupName: Submitted by taskcluster
     chunks:
       total: 1
       current: {{chunk}}
--- a/testing/taskcluster/tasks/tests/flame_kk_gaia_ui_test_functional.yml
+++ b/testing/taskcluster/tasks/tests/flame_kk_gaia_ui_test_functional.yml
@@ -8,36 +8,16 @@ task:
   workerType: flame-kk-1-sim
 
   payload:
     capabilities:
       devices:
         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
 
     treeherder:
       groupName: Gaia Python Integration Tests
       groupSymbol: tc-Gip
       symbol: 'f{{chunk}}'
--- a/testing/taskcluster/tasks/tests/flame_kk_gaia_ui_test_functional_dsds.yml
+++ b/testing/taskcluster/tasks/tests/flame_kk_gaia_ui_test_functional_dsds.yml
@@ -3,37 +3,22 @@
   from: 'tasks/phone_test.yml'
 task:
   metadata:
     name: '[TC] Gaia Python Integration Functional DSDS Tests'
     description: Gaia Python Integration Functional DSDS Tests run
   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
       groupSymbol: tc-Gip
       symbol: 'f-dsds'
       productName: b2g
--- a/testing/taskcluster/tasks/tests/flame_kk_gaia_ui_test_sanity.yml
+++ b/testing/taskcluster/tasks/tests/flame_kk_gaia_ui_test_sanity.yml
@@ -4,37 +4,22 @@
 task:
   metadata:
     name: '[TC] Gaia Python Integration Sanity Tests'
     description: Gaia Python Integration Sanity Tests run
   workerType: flame-kk-1-sim
   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
       groupSymbol: tc-Gip
       symbol: 's'
       productName: b2g
--- a/testing/taskcluster/tasks/tests/flame_kk_gaia_ui_test_unit.yml
+++ b/testing/taskcluster/tasks/tests/flame_kk_gaia_ui_test_unit.yml
@@ -3,32 +3,17 @@
   from: 'tasks/phone_test.yml'
 task:
   metadata:
     name: '[TC] Gaia Python Integration Unit Tests'
     description: Gaia Python Integration Tests run
   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:
       groupName: Gaia Python Integration Tests
       groupSymbol: tc-Gip
       symbol: 'u'
       productName: b2g