Bug 1200928 - Part 2: [Taskcluster] Use correct busybox binary for x86/arm emulator when running xpcshell tests. r=garndt
authorEdgar Chen <echen@mozilla.com>
Tue, 17 Nov 2015 16:05:01 +0800
changeset 276583 77ab820ce477438af4b32cea83f82fd55744cec7
parent 276582 8284bea565d7c5aef8fd5e3c967af8e7bfba74df
child 276637 f143af51f6e35932927b8ccac2509facbbe7b539
child 276745 bb0e4752f9bbab121139b52ed6dbff7b5b1f08e2
push id29804
push usercbook@mozilla.com
push dateThu, 17 Dec 2015 10:56:02 +0000
treeherdermozilla-central@77ab820ce477 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersgarndt
bugs1200928
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 1200928 - Part 2: [Taskcluster] Use correct busybox binary for x86/arm emulator when running xpcshell tests. r=garndt
testing/taskcluster/mach_commands.py
testing/taskcluster/tasks/branches/cedar/job_flags.yml
testing/taskcluster/tasks/builds/b2g_emulator_base.yml
testing/taskcluster/tasks/builds/b2g_emulator_x86_base.yml
testing/taskcluster/tasks/tests/b2g_emulator_xpcshell.yml
testing/taskcluster/tasks/tests/b2g_emulator_xpcshell_chunked.yml
--- a/testing/taskcluster/mach_commands.py
+++ b/testing/taskcluster/mach_commands.py
@@ -421,16 +421,20 @@ class Graph(object):
             graph['tasks'].append(build_task)
 
             for location in build_task['task']['extra'].get('locations', {}):
                 build_parameters['{}_url'.format(location)] = ARTIFACT_URL.format(
                     build_parameters['build_slugid'],
                     build_task['task']['extra']['locations'][location]
                 )
 
+            for url in build_task['task']['extra'].get('url', {}):
+                build_parameters['{}_url'.format(url)] = \
+                    build_task['task']['extra']['url'][url]
+
             define_task = DEFINE_TASK.format(build_task['task']['workerType'])
 
             for route in build_task['task'].get('routes', []):
                 if route.startswith('index.gecko.v2') and route in all_routes:
                     raise Exception("Error: route '%s' is in use by multiple tasks: '%s' and '%s'" % (
                         route,
                         build_task['task']['metadata']['name'],
                         all_routes[route],
--- a/testing/taskcluster/tasks/branches/cedar/job_flags.yml
+++ b/testing/taskcluster/tasks/branches/cedar/job_flags.yml
@@ -141,12 +141,13 @@ tests:
   reftest-sanity-oop:
     allowed_build_tasks:
       tasks/builds/b2g_desktop_opt.yml:
         task: tasks/tests/b2g_reftests_sanity_oop.yml
         chunks: 1
   xpcshell:
     allowed_build_tasks:
       tasks/builds/b2g_emulator_ics_opt.yml:
-        task: tasks/tests/b2g_emulator_xpcshell.yml
+        task: tasks/tests/b2g_emulator_xpcshell_chunked.yml
+        chunks: 1
       tasks/builds/b2g_emulator_ics_debug.yml:
         task: tasks/tests/b2g_emulator_xpcshell_chunked.yml
         chunks: 2
--- a/testing/taskcluster/tasks/builds/b2g_emulator_base.yml
+++ b/testing/taskcluster/tasks/builds/b2g_emulator_base.yml
@@ -30,8 +30,10 @@ task:
   extra:
     # Rather then enforcing particular conventions we require that all build
     # tasks provide the "build" extra field to specify where the build and tests
     # files are located.
     locations:
       build: 'public/build/emulator.tar.gz'
       symbols: 'public/build/b2g-crashreporter-symbols.zip'
       sources: 'public/build/sources.xml'
+    url:
+      busybox: 'https://api.pub.build.mozilla.org/tooltool/sha512/0748e900821820f1a42e2f1f3fa4d9002ef257c351b9e6b78e7de0ddd0202eace351f440372fbb1ae0b7e69e8361b036f6bd3362df99e67fc585082a311fc0df'
--- a/testing/taskcluster/tasks/builds/b2g_emulator_x86_base.yml
+++ b/testing/taskcluster/tasks/builds/b2g_emulator_x86_base.yml
@@ -24,8 +24,10 @@ task:
     # Rather then enforcing particular conventions we require that all build
     # tasks provide the "build" extra field to specify where the build and tests
     # files are located.
     locations:
       build: 'public/build/emulator.tar.gz'
       tests: 'public/build/b2g-tests.zip'
       symbols: 'public/build/b2g-crashreporter-symbols.zip'
       sources: 'public/build/sources.xml'
+    url:
+      busybox: 'https://api.pub.build.mozilla.org/tooltool/sha512/227d3189be1eb1e5348255ca100168bae8b3c4d3664384ea3c832fc044d168fd594f0b15991d190eceb1fb9f5b3463912104bcd7d4d0dbdd88d3f4b7187ea73d'
deleted file mode 100644
--- a/testing/taskcluster/tasks/tests/b2g_emulator_xpcshell.yml
+++ /dev/null
@@ -1,34 +0,0 @@
----
-$inherits:
-  from: 'tasks/tests/b2g_unittest_base.yml'
-task:
-  metadata:
-    name: '[TC] XPCShell'
-    description: XPCShell test run
-
-  workerType: b2gtest-emulator
-  payload:
-    maxRunTime: 6000
-    command:
-      - entrypoint
-      - >
-        python ./mozharness/scripts/b2g_emulator_unittest.py
-        --config-file ./mozharness/configs/b2g/emulator_automation_config.py
-        --config-file ./mozharness_configs/emulator_override.py
-        --config-file ./mozharness_configs/remove_executables.py
-        --download-symbols ondemand
-        --test-suite xpcshell
-        --installer-url {{build_url}}
-        --test-packages-url {{test_packages_url}}
-        --xre-url https://queue.taskcluster.net/v1/task/wXAHAaxDQpqxoWF1iljJjg/runs/0/artifacts/public/cache/xulrunner-sdk-40.zip
-    artifacts:
-      'public/build':
-        type: directory
-        path: '/home/worker/artifacts/'
-        expires: '{{#from_now}}1 year{{/from_now}}'
-
-  extra:
-    treeherder:
-      groupName: XPCShell
-      symbol: X
-      productName: b2g
--- a/testing/taskcluster/tasks/tests/b2g_emulator_xpcshell_chunked.yml
+++ b/testing/taskcluster/tasks/tests/b2g_emulator_xpcshell_chunked.yml
@@ -9,23 +9,23 @@ task:
   workerType: b2gtest-emulator
   payload:
     maxRunTime: 6000
     command:
       - entrypoint
       - >
         python ./mozharness/scripts/b2g_emulator_unittest.py
         --config-file ./mozharness/configs/b2g/emulator_automation_config.py
-        --config-file ./mozharness_configs/emulator_override.py
         --config-file ./mozharness_configs/remove_executables.py
         --download-symbols ondemand
         --test-suite xpcshell
         --installer-url {{build_url}}
         --test-packages-url {{test_packages_url}}
         --xre-url https://queue.taskcluster.net/v1/task/wXAHAaxDQpqxoWF1iljJjg/runs/0/artifacts/public/cache/xulrunner-sdk-40.zip
+        --busybox-url {{busybox_url}}
         --this-chunk {{chunk}}
         --total-chunk {{total_chunks}}
     artifacts:
       'public/build':
         type: directory
         path: '/home/worker/artifacts/'
         expires: '{{#from_now}}1 year{{/from_now}}'