Backout 11ba4c03d205 for gecko decision bustage

--HG--
extra : commitid : 9EAoXaksr4K

testing/mozharness/configs/remove_executables.py

@@ -1,6 +0,0 @@
-config = {
-    # We bake this directly into the tester image now...
-    "download_minidump_stackwalk": False,
-    "minidump_stackwalk_path": "/usr/local/bin/linux64-minidump_stackwalk",
-    "exes": {}
-}

testing/taskcluster/mach_commands.py

@@ -543,27 +543,19 @@ class Graph(object):
                 if mozharness_url:
                     test_parameters['mozharness_url'] = mozharness_url
                 test_definition = templates.load(test['task'], {})['task']
-                chunk_config = test_definition['extra'].get('chunks', {})
+                chunk_config = test_definition['extra']['chunks']
 
                 # Allow branch configs to override task level chunking...
                 if 'chunks' in test:
                     chunk_config['total'] = test['chunks']
 
-                chunked = 'total' in chunk_config
-                if chunked:
                 test_parameters['total_chunks'] = chunk_config['total']
 
-                if 'suite' in test_definition['extra']:
-                    suite_config = test_definition['extra']['suite']
-                    test_parameters['suite'] = suite_config['name']
-                    test_parameters['flavor'] = suite_config.get('flavor', '')
-
-                for chunk in range(1, chunk_config.get('total', 1) + 1):
-                    if 'only_chunks' in test and chunked and \
+                for chunk in range(1, chunk_config['total'] + 1):
+                    if 'only_chunks' in test and \
                         chunk not in test['only_chunks']:
                         continue
 
-                    if chunked:
                     test_parameters['chunk'] = chunk
                     test_task = configure_dependent_task(test['task'],
                                                          test_parameters,

testing/taskcluster/scripts/tester/test-linux.sh

@@ -78,9 +78,13 @@ fi
 # support multiple, space delimited, config files
 config_cmds=""
 for cfg in $MOZHARNESS_CONFIG; do
-  config_cmds="${config_cmds} --config-file ${cfg}"
+  config_cmds="${config_cmds} --config ${cfg}"
 done
 
+# TODO: this config should be folded into others once we are no longer
+# also running tests in Buildbot
+config_cmds="${config_cmds} --config-file remove_executables.py"
+
 # run the given mozharness script and configs, but pass the rest of the
 # arguments in from our own invocation
 python2.7 $WORKSPACE/${MOZHARNESS_SCRIPT} ${config_cmds} "${@}"

testing/taskcluster/tasks/builds/firefox_base.yml

@@ -2,8 +2,3 @@ $inherits:
   from: 'tasks/build.yml'
   variables:
     build_product: 'firefox'
-task:
-  extra:
-    locations:
-      mozharness: 'public/build/mozharness.zip'
-      test_packages: 'public/build/test_packages.json'

testing/taskcluster/tasks/builds/linux64_clobber.yml

@@ -44,3 +44,4 @@ task:
     # files are located, relative to the task's artifacts URL
     locations:
       build: 'public/build/target.tar.bz2'
+      tests: 'public/build/target.tests.zip'

testing/taskcluster/tasks/test.yml

@@ -15,11 +15,27 @@ task:
     - 'docker-worker:image:{{#docker_image}}tester{{/docker_image}}'
     - 'queue:define-task:aws-provisioner-v1/test-c4-2xlarge'
     - 'queue:create-task:aws-provisioner-v1/test-c4-2xlarge'
+    - 'docker-worker:cache:tc-vcs'
+    - 'docker-worker:cache:linux-cache'
+    - 'docker-worker:capability:device:loopbackVideo'
+    - 'docker-worker:capability:device:loopbackAudio'
 
   payload:
+    capabilities:
+      devices:
+        loopbackVideo: true
+        loopbackAudio: true
     image: '{{#docker_image}}tester{{/docker_image}}'
     maxRunTime: 3600
+    cache:
+      # So pip installs are cached...
+      linux-cache: /home/worker/.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}}}'
       MOZILLA_BUILD_URL: '{{build_url}}'
       MOZHARNESS_URL: '{{mozharness_url}}'
 

testing/taskcluster/tasks/tests/b2g_build_test.yml

@@ -1,6 +1,6 @@
 ---
 $inherits:
-  from: 'b2g_unittest_base.yml'
+  from: 'tasks/test.yml'
 task:
   metadata:
     name: '[TC] - Gaia Build Test'

testing/taskcluster/tasks/tests/b2g_build_unit.yml

@@ -1,6 +1,6 @@
 ---
 $inherits:
-  from: 'b2g_unittest_base.yml'
+  from: 'tasks/test.yml'
 task:
   metadata:
     name: '[TC] - Gaia Build Unit Test'

testing/taskcluster/tasks/tests/b2g_emulator_cpp_unit.yml

@@ -1,6 +1,6 @@
 ---
 $inherits:
-  from: 'tasks/tests/b2g_unittest_base.yml'
+  from: 'tasks/test.yml'
 task:
   metadata:
     name: '[TC] CPP Unit Tests'

testing/taskcluster/tasks/tests/b2g_emulator_crashtest.yml

@@ -1,6 +1,6 @@
 ---
 $inherits:
-  from: 'tasks/tests/b2g_unittest_base.yml'
+  from: 'tasks/test.yml'
 task:
   metadata:
     name: '[TC] Crashtest'

testing/taskcluster/tasks/tests/b2g_emulator_js_reftest.yml

@@ -1,6 +1,6 @@
 ---
 $inherits:
-  from: 'tasks/tests/b2g_unittest_base.yml'
+  from: 'tasks/test.yml'
 task:
   metadata:
     name: '[TC] JSReftest'

testing/taskcluster/tasks/tests/b2g_emulator_marionette.yml

@@ -1,6 +1,6 @@
 ---
 $inherits:
-  from: 'tasks/tests/b2g_unittest_base.yml'
+  from: 'tasks/test.yml'
 task:
   metadata:
     name: '[TC] Marionette Framework Unit Tests'

testing/taskcluster/tasks/tests/b2g_emulator_marionette_webapi.yml

@@ -1,6 +1,6 @@
 ---
 $inherits:
-  from: 'tasks/tests/b2g_unittest_base.yml'
+  from: 'tasks/test.yml'
 task:
   metadata:
     name: '[TC] Marionette WebAPI Tests'

testing/taskcluster/tasks/tests/b2g_emulator_mochitest.yml

@@ -1,6 +1,6 @@
 ---
 $inherits:
-  from: 'tasks/tests/b2g_unittest_base.yml'
+  from: 'tasks/test.yml'
 task:
   metadata:
     name: '[TC] Mochitest'

testing/taskcluster/tasks/tests/b2g_emulator_mochitest_media.yml

@@ -1,6 +1,6 @@
 ---
 $inherits:
-  from: 'tasks/tests/b2g_unittest_base.yml'
+  from: 'tasks/test.yml'
 task:
   metadata:
     name: '[TC] Mochitest'

testing/taskcluster/tasks/tests/b2g_emulator_reftest.yml

@@ -1,6 +1,6 @@
 ---
 $inherits:
-  from: 'tasks/tests/b2g_unittest_base.yml'
+  from: 'tasks/test.yml'
 task:
   metadata:
     name: '[TC] Reftest'

testing/taskcluster/tasks/tests/b2g_emulator_xpcshell.yml

@@ -1,6 +1,6 @@
 ---
 $inherits:
-  from: 'tasks/tests/b2g_unittest_base.yml'
+  from: 'tasks/test.yml'
 task:
   metadata:
     name: '[TC] XPCShell'

testing/taskcluster/tasks/tests/b2g_emulator_xpcshell_chunked.yml

@@ -1,6 +1,6 @@
 ---
 $inherits:
-  from: 'tasks/tests/b2g_unittest_base.yml'
+  from: 'tasks/test.yml'
 task:
   metadata:
     name: '[TC] XPCShell'

testing/taskcluster/tasks/tests/b2g_gaia_js_integration_tests.yml

@@ -1,6 +1,6 @@
 ---
 $inherits:
-  from: 'tasks/tests/b2g_unittest_base.yml'
+  from: 'tasks/test.yml'
 task:
   metadata:
     name: '[TC] - Gaia JS Integration Test'

testing/taskcluster/tasks/tests/b2g_gaia_unit.yml

@@ -1,6 +1,6 @@
 ---
 $inherits:
-  from: 'tasks/tests/b2g_unittest_base.yml'
+  from: 'tasks/test.yml'
 task:
   metadata:
     name: '[TC] Gaia Unit Test'

testing/taskcluster/tasks/tests/b2g_gaia_unit_oop.yml

@@ -1,6 +1,6 @@
 ---
 $inherits:
-  from: 'tasks/tests/b2g_unittest_base.yml'
+  from: 'tasks/test.yml'
 task:
   metadata:
     name: '[TC] Gaia Unit Test OOP'

testing/taskcluster/tasks/tests/b2g_linter.yml

@@ -1,6 +1,6 @@
 ---
 $inherits:
-  from: 'tasks/tests/b2g_unittest_base.yml'
+  from: 'tasks/test.yml'
 task:
   metadata:
     name: '[TC] - Gaia Linter'

testing/taskcluster/tasks/tests/b2g_mochitest.yml

@@ -1,6 +1,6 @@
 ---
 $inherits:
-  from: 'tasks/tests/b2g_unittest_base.yml'
+  from: 'tasks/test.yml'
 task:
   metadata:
     name: '[TC] B2G Mochitests {{chunk}}'

testing/taskcluster/tasks/tests/b2g_mochitest_oop.yml

@@ -1,6 +1,6 @@
 ---
 $inherits:
-  from: 'tasks/tests/b2g_unittest_base.yml'
+  from: 'tasks/test.yml'
 task:
   metadata:
     name: '[TC] Mochitest OOP'

testing/taskcluster/tasks/tests/b2g_reftests.yml

@@ -1,6 +1,6 @@
 ---
 $inherits:
-  from: 'tasks/tests/b2g_unittest_base.yml'
+  from: 'tasks/test.yml'
 task:
   metadata:
     name: '[TC] Reftest'

testing/taskcluster/tasks/tests/b2g_reftests_sanity_oop.yml

@@ -1,6 +1,6 @@
 ---
 $inherits:
-  from: 'tasks/tests/b2g_unittest_base.yml'
+  from: 'tasks/test.yml'
 task:
   metadata:
     name: '[TC] Reftest Sanity OOP'

testing/taskcluster/tasks/tests/b2g_unittest_base.yml

@@ -1,23 +0,0 @@
----
-$inherits:
-  from: 'tasks/test.yml'
-task:
-  scopes:
-    - 'docker-worker:cache:tc-vcs'
-    - 'docker-worker:cache:linux-cache'
-    - 'docker-worker:capability:device:loopbackVideo'
-    - 'docker-worker:capability:device:loopbackAudio'
-  payload:
-    cache:
-      # So pip installs are cached...
-      linux-cache: /home/worker/.cache
-      tc-vcs: '/home/worker/.tc-vcs'
-    capabilities:
-      devices:
-        loopbackVideo: true
-        loopbackAudio: true
-    env:
-      GAIA_HEAD_REPOSITORY: '{{{gaia_head_repository}}}'
-      GAIA_BASE_REPOSITORY: '{{{gaia_base_repository}}}'
-      GAIA_REF: '{{{gaia_ref}}}'
-      GAIA_REV: '{{{gaia_rev}}}'

testing/taskcluster/tasks/tests/fx_linux64_mochitest_bc.yml

@@ -1,26 +0,0 @@
----
-$inherits:
-  from: 'tasks/tests/fx_unittest_base.yml'
-task:
-  scopes:
-    - 'docker-worker:capability:device:loopbackVideo'
-    - 'docker-worker:capability:device:loopbackAudio'
-  metadata:
-    name: '[TC] Linux64 mochitest-browser-chrome M(bc{{chunk}})'
-    description: Mochitest browser-chrome run {{chunk}}
-  payload:
-    capabilities:
-      devices:
-        loopbackVideo: true
-        loopbackAudio: true
-  extra:
-    chunks:
-      total: 7
-    suite:
-      name: mochitest
-      flavor: browser-chrome-chunked
-    treeherder:
-      groupName: Desktop mochitests
-      groupSymbol: tc-M
-      symbol: bc{{chunk}}
-

testing/taskcluster/tasks/tests/fx_linux64_mochitest_dt.yml

@@ -1,25 +0,0 @@
----
-$inherits:
-  from: 'tasks/tests/fx_unittest_base.yml'
-task:
-  scopes:
-    - 'docker-worker:capability:device:loopbackVideo'
-    - 'docker-worker:capability:device:loopbackAudio'
-  metadata:
-    name: '[TC] Linux64 mochitest-devtools-chrome M(dt{{chunk}})'
-    description: Mochitest devtools-chrome run {{chunk}}
-  payload:
-    capabilities:
-      devices:
-        loopbackVideo: true
-        loopbackAudio: true
-  extra:
-    chunks:
-      total: 2
-    suite:
-      name: mochitest
-      flavor: mochitest-devtools-chrome
-    treeherder:
-      groupName: Desktop mochitests
-      groupSymbol: tc-M
-      symbol: dt{{chunk}}

testing/taskcluster/tasks/tests/fx_linux64_mochitest_gl.yml

@@ -1,22 +0,0 @@
-$inherits:
-  from: 'tasks/tests/fx_unittest_base.yml'
-task:
-  scopes:
-    - 'docker-worker:capability:device:loopbackVideo'
-    - 'docker-worker:capability:device:loopbackAudio'
-  metadata:
-    name: '[TC] Linux64 mochitest-gl M(gl)'
-    description: Mochitest webgl run
-  payload:
-    capabilities:
-      devices:
-        loopbackVideo: true
-        loopbackAudio: true
-  extra:
-    suite:
-      name: mochitest
-      flavor: mochitest-gl
-    treeherder:
-      groupName: Desktop mochitests
-      groupSymbol: tc-M
-      symbol: gl

testing/taskcluster/tasks/tests/fx_linux64_mochitest_plain.yml

@@ -1,25 +0,0 @@
----
-$inherits:
-  from: 'tasks/tests/fx_unittest_base.yml'
-task:
-  scopes:
-    - 'docker-worker:capability:device:loopbackVideo'
-    - 'docker-worker:capability:device:loopbackAudio'
-  metadata:
-    name: '[TC] Linux64 mochitest-plain {{chunk}}'
-    description: Mochitest plain run {{chunk}}
-  payload:
-    capabilities:
-      devices:
-        loopbackVideo: true
-        loopbackAudio: true
-  extra:
-    chunks:
-      total: 5
-    suite:
-      name: mochitest
-      flavor: plain-chunked
-    treeherder:
-      groupName: Desktop mochitests
-      groupSymbol: tc-M
-      symbol: {{chunk}}

testing/taskcluster/tasks/tests/fx_linux64_reftest.yml

@@ -1,17 +0,0 @@
----
-$inherits:
-  from: 'tasks/tests/fx_unittest_base.yml'
-task:
-  metadata:
-    name: '[TC] Linux64 reftest {{chunk}}'
-    description: Reftest run {{chunk}}
-  extra:
-    chunks:
-      total: 4
-    suite:
-      name: reftest
-      flavor: reftest
-    treeherder:
-      groupName: Desktop reftest
-      groupSymbol: tc-R
-      symbol: {{chunk}}

testing/taskcluster/tasks/tests/fx_linux64_xpcshell.yml

@@ -1,17 +0,0 @@
----
-$inherits:
-  from: 'tasks/tests/fx_unittest_base.yml'
-task:
-  metadata:
-    name: '[TC] Linux64 xpcshell {{chunk}}'
-    description: XPCShell run {{chunk}}
-  extra:
-    chunks:
-      total: 2
-    suite:
-      name: xpcshell
-      flavor: xpcshell
-    treeherder:
-      groupName: Desktop xpcshell tests
-      groupSymbol: tc-X
-      symbol: {{chunk}}

testing/taskcluster/tasks/tests/fx_unittest_base.yml

@@ -1,34 +0,0 @@
----
-$inherits:
-  from: 'tasks/test.yml'
-task:
-  payload:
-    image: '{{#docker_image}}desktop-test{{/docker_image}}'
-    command:
-      - bash
-      - /home/worker/bin/test.sh
-      - --no-read-buildbot-config
-      - --installer-url={{build_url}}
-      - --test-packages-url={{test_packages_url}}
-      - --download-symbols=ondemand
-      - --{{suite}}-suite={{flavor}}
-      - --total-chunk={{total_chunks}}
-      - --this-chunk={{chunk}}
-    env:
-        GECKO_HEAD_REPOSITORY: '{{{head_repository}}}'
-        GECKO_HEAD_REV: '{{{head_rev}}}'
-        MOZHARNESS_SCRIPT: 'mozharness/scripts/desktop_unittest.py'
-        # TODO move linux_unittest.py to a platform specific config
-        MOZHARNESS_CONFIG: >
-          mozharness/configs/unittests/linux_unittest.py
-          mozharness/configs/remove_executables.py
-    artifacts:
-      'public/build':
-        type: directory
-        path: '/home/worker/artifacts/'
-        expires: '{{#from_now}}1 year{{/from_now}}'
-
-  extra:
-    treeherderEnv:
-      - production
-      - staging

testing/taskcluster/tasks/tests/mulet_build_test.yml

@@ -1,6 +1,6 @@
 ---
 $inherits:
-  from: 'tasks/tests/b2g_unittest_base.yml'
+  from: 'tasks/test.yml'
 task:
   metadata:
     name: '[TC] - Gaia Build Test'

testing/taskcluster/tasks/tests/mulet_build_unit.yml

@@ -1,6 +1,6 @@
 ---
 $inherits:
-  from: 'tasks/tests/b2g_unittest_base.yml'
+  from: 'tasks/test.yml'
 task:
   metadata:
     name: '[TC] - Gaia Build Unit Test'

testing/taskcluster/tasks/tests/mulet_gaia_js_integration_tests.yml

@@ -1,6 +1,6 @@
 ---
 $inherits:
-  from: 'tasks/tests/b2g_unittest_base.yml'
+  from: 'tasks/test.yml'
 task:
   metadata:
     name: '[TC] Mulet Gaia JS Integration Test'

testing/taskcluster/tasks/tests/mulet_gaia_unit.yml

@@ -1,6 +1,6 @@
 ---
 $inherits:
-  from: 'tasks/tests/b2g_unittest_base.yml'
+  from: 'tasks/test.yml'
 task:
   metadata:
     name: '[TC] Mulet Gaia Unit Test'

testing/taskcluster/tasks/tests/mulet_gaia_unit_oop.yml

@@ -1,6 +1,6 @@
 ---
 $inherits:
-  from: 'tasks/tests/b2g_unittest_base.yml'
+  from: 'tasks/test.yml'
 task:
   metadata:
     name: '[TC] Mulet Gaia Unit Test OOP'

testing/taskcluster/tasks/tests/mulet_linter.yml

@@ -1,6 +1,6 @@
 ---
 $inherits:
-  from: 'tasks/tests/b2g_unittest_base.yml'
+  from: 'tasks/test.yml'
 task:
   metadata:
     name: '[TC] - Gaia Linter'

testing/taskcluster/tasks/tests/mulet_mochitests.yml

@@ -1,6 +1,6 @@
 ---
 $inherits:
-  from: 'tasks/tests/b2g_unittest_base.yml'
+  from: 'tasks/test.yml'
 task:
   metadata:
     name: '[TC] Mulet Mochitests ( {{chunk}} )'

testing/taskcluster/tasks/tests/mulet_reftests.yml

@@ -1,6 +1,6 @@
 ---
 $inherits:
-  from: 'tasks/tests/b2g_unittest_base.yml'
+  from: 'tasks/test.yml'
 task:
   metadata:
     name: '[TC] Reftest'