Backed out changeset c6ecaa5b3dde (bug 1225458) for test failures in decision task

testing/taskcluster/tasks/phone_test.yml

@@ -19,7 +19,7 @@ task:
 
   payload:
     image: '{{#docker_image}}tester-device{{/docker_image}}'
-    maxRunTime: 7200
+    maxRunTime: 3600
     cache:
       tc-vcs: '/home/worker/.tc-vcs'
     env:
@@ -27,7 +27,6 @@ task:
       GAIA_BASE_REPOSITORY: '{{{gaia_base_repository}}}'
       GAIA_REF: '{{{gaia_ref}}}'
       GAIA_REV: '{{{gaia_rev}}}'
-      TESTS_TIMEOUT_IN_MS: 30000
 
     log: 'private/b2g/logs/live.log'
 
@@ -43,19 +42,9 @@ task:
         path: '/home/worker/upload/logs/'
         expires: '{{#from_now}}1 year{{/from_now}}'
 
-    capabilities:
-      devices:
-        phone:
-          type: 'flame'
-          memory: '512'
-          sims: '0'
-          build: '{{{img_url}}}'
-      features:
-        testdroidProxy: true
-
   extra:
     treeherder:
-    orbl  groupSymbol: tc
+      groupSymbol: tc
       groupName: Submitted by taskcluster
     chunks:
       total: 1

testing/taskcluster/tasks/tests/flame_kk_gaia_ui_test_functional.yml

@@ -11,8 +11,13 @@ task:
     capabilities:
       devices:
         phone:
+          type: 'flame'
+          memory: '319'
           sims: '1'
-
+          build: '{{{img_url}}}'
+    features:
+      testdroidProxy: true
+    maxRunTime: 7200
     command:
       - >
         gaiatest
@@ -25,7 +30,7 @@ task:
         --address=$PROXY_HOST:$MARIONETTE_PORT
         --device $SERIAL_ID
         --xml-output=/home/worker/upload/logs/xml_output.xml
-        --timeout=$TESTS_TIMEOUT_IN_MS
+        --timeout=10000
         --log-html=/home/worker/upload/logs/index.html
         --restart
         --type=b2g-dsds

testing/taskcluster/tasks/tests/flame_kk_gaia_ui_test_functional_dsds.yml

@@ -11,8 +11,13 @@ task:
     capabilities:
       devices:
         phone:
+          type: 'flame'
+          memory: '319'
           sims: '2'
-
+          build: '{{{img_url}}}'
+    features:
+      testdroidProxy: true
+    maxRunTime: 7200
     command:
       - >
         gaiatest
@@ -23,7 +28,7 @@ task:
         --address=$PROXY_HOST:$MARIONETTE_PORT
         --device $SERIAL_ID
         --xml-output=/home/worker/upload/logs/xml_output.xml
-        --timeout=$TESTS_TIMEOUT_IN_MS
+        --timeout=10000
         --log-html=/home/worker/upload/logs/index.html
         --restart
         --type=b2g+dsds

testing/taskcluster/tasks/tests/flame_kk_gaia_ui_test_sanity.yml

@@ -12,8 +12,13 @@ task:
     capabilities:
       devices:
         phone:
+          type: 'flame'
+          memory: '319'
           sims: '1'
-
+          build: '{{{img_url}}}'
+    features:
+      testdroidProxy: true
+    maxRunTime: 7200
     command:
       - >
         gaiatest
@@ -24,7 +29,7 @@ task:
         --address=$PROXY_HOST:$MARIONETTE_PORT
         --device $SERIAL_ID
         --xml-output=/home/worker/upload/logs/xml_output.xml
-        --timeout=$TESTS_TIMEOUT_IN_MS
+        --timeout=10000
         --log-html=/home/worker/upload/logs/index.html
         --restart
         --type=b2g+sanity-dsds

testing/taskcluster/tasks/tests/flame_kk_gaia_ui_test_unit.yml

@@ -8,6 +8,16 @@ task:
   workerType: flame-kk-0-sim
 
   payload:
+    capabilities:
+      devices:
+        phone:
+          type: 'flame'
+          memory: '319'
+          sims: '0'
+          build: '{{{img_url}}}'
+    features:
+      testdroidProxy: true
+    maxRunTime: 7200
     command:
       - >
         gaiatest
@@ -18,7 +28,7 @@ task:
         --address=$PROXY_HOST:$MARIONETTE_PORT
         --device $SERIAL_ID
         --xml-output=/home/worker/upload/logs/xml_output.xml
-        --timeout=$TESTS_TIMEOUT_IN_MS
+        --timeout=10000
         --log-html=/home/worker/upload/logs/index.html
         --restart
         --type=b2g