Backed out 2fca80f6710c for breaking tc-gip
authorJohan Lorenzo <jlorenzo@mozilla.com>
Tue, 22 Dec 2015 17:56:48 +0100
changeset 277290 1f0f71563efc4e7d49cf6a2a8ce10533a579f670
parent 277289 42d08735dae077433216ad7da9cfda9e347ce95e
child 277291 988034ad9507493c5b930db92ba93e58c069826e
push id29820
push usercbook@mozilla.com
push dateWed, 23 Dec 2015 10:57:25 +0000
treeherderautoland@5ed5f6f57359 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1225458
milestone46.0a1
backs out2fca80f6710c89bc58981b38ffd0974b76ed283c
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
Backed out 2fca80f6710c for breaking tc-gip Bug 1225458 - [tc-gip] Change the configuration of the job (memory, timeout)
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
@@ -14,49 +14,38 @@ task:
   scopes:
     - 'docker-worker:image:{{#docker_image}}tester-device{{/docker_image}}'
     - 'queue:create-task:aws-provisioner-v1/testdroid-device'
     - 'docker-worker:cache:tc-vcs'
     - 'docker-worker:capability:device:phone'
 
   payload:
     image: '{{#docker_image}}tester-device{{/docker_image}}'
-    maxRunTime: 7200
+    maxRunTime: 3600
     cache:
       tc-vcs: '/home/worker/.tc-vcs'
     env:
       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
 
     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'
         expires: '{{#from_now}}1 year{{/from_now}}'
 
       'private/b2g/logs':
         type: directory
         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:
       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
@@ -6,31 +6,36 @@ task:
     name: '[TC] Gaia Python Functional Integration Tests'
     description: Gaia Python Functional Integration Tests run {{chunk}}
   workerType: flame-kk-1-sim
 
   payload:
     capabilities:
       devices:
         phone:
+          type: 'flame'
+          memory: '319'
           sims: '1'
-
+          build: '{{{img_url}}}'
+    features:
+      testdroidProxy: true
+    maxRunTime: 7200
     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
+        --timeout=10000
         --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:
--- 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
@@ -6,29 +6,34 @@ task:
     name: '[TC] Gaia Python Integration Functional DSDS Tests'
     description: Gaia Python Integration Functional DSDS Tests run
   workerType: flame-kk-2-sim
 
   payload:
     capabilities:
       devices:
         phone:
+          type: 'flame'
+          memory: '319'
           sims: '2'
-
+          build: '{{{img_url}}}'
+    features:
+      testdroidProxy: true
+    maxRunTime: 7200
     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
+        --timeout=10000
         --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:
--- a/testing/taskcluster/tasks/tests/flame_kk_gaia_ui_test_sanity.yml
+++ b/testing/taskcluster/tasks/tests/flame_kk_gaia_ui_test_sanity.yml
@@ -7,29 +7,34 @@ task:
     description: Gaia Python Integration Sanity Tests run
   workerType: flame-kk-1-sim
   retries: 0
 
   payload:
     capabilities:
       devices:
         phone:
+          type: 'flame'
+          memory: '319'
           sims: '1'
-
+          build: '{{{img_url}}}'
+    features:
+      testdroidProxy: true
+    maxRunTime: 7200
     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
+        --timeout=10000
         --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:
--- 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,27 +3,37 @@
   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:
+    capabilities:
+      devices:
+        phone:
+          type: 'flame'
+          memory: '319'
+          sims: '0'
+          build: '{{{img_url}}}'
+    features:
+      testdroidProxy: true
+    maxRunTime: 7200
     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
+        --timeout=10000
         --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
 
   extra: