Bug 1200928 - Part 2: [Taskcluster] Use correct busybox binary for x86/arm emulator when running xpcshell tests. r=garndt

--HG--
extra : commitid : 9fP4f8IzaAJ
extra : rebase_source : 0757ebd3f89842ac29abbee32995957eb1104ad5
extra : histedit_source : ae9cc00980e520e63e48227789dd11e0d171f3cc

testing/taskcluster/mach_commands.py

@@ -426,6 +426,10 @@ class Graph(object):
                     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', []):

testing/taskcluster/tasks/branches/cedar/job_flags.yml

@@ -146,7 +146,8 @@ tests:
   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

testing/taskcluster/tasks/builds/b2g_emulator_base.yml

@@ -35,3 +35,5 @@ task:
       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'

testing/taskcluster/tasks/builds/b2g_emulator_x86_base.yml

@@ -29,3 +29,5 @@ task:
       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'

testing/taskcluster/tasks/tests/b2g_emulator_xpcshell.yml

@@ -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

testing/taskcluster/tasks/tests/b2g_emulator_xpcshell_chunked.yml

@@ -14,13 +14,13 @@ task:
       - >
         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: