Bug 1343327 - Export more test job state as environment vars in taskcluster r=dustin

MozReview-Commit-ID: GBmL4lhAa8u

--HG--
extra : rebase_source : 2ec4a7e709280420c2e08e58864b1a3c2f5514e7

taskcluster/ci/test/tests.yml

@@ -414,6 +414,7 @@ mochitest:
     mozharness:
         by-test-platform:
             android.*:
+                mochitest-flavor: plain
                 script: android_emulator_unittest.py
                 no-read-buildbot-config: true
                 config:
@@ -421,6 +422,7 @@ mochitest:
                 extra-options:
                     - --test-suite=mochitest
             default:
+                mochitest-flavor: plain
                 script: desktop_unittest.py
                 no-read-buildbot-config: true
                 chunked: true
@@ -456,6 +458,7 @@ mochitest-a11y:
         script: desktop_unittest.py
         no-read-buildbot-config: true
         chunked: false
+        mochitest-flavor: a11y
         config:
             by-test-platform:
                 windows.*:
@@ -498,6 +501,7 @@ mochitest-browser-chrome:
             linux32/debug: 5400
             default: 3600
     mozharness:
+        mochitest-flavor: browser
         script: desktop_unittest.py
         no-read-buildbot-config: true
         chunked: true
@@ -537,6 +541,7 @@ mochitest-browser-screenshots:
     e10s: true
     max-run-time: 3600
     mozharness:
+        mochitest-flavor: browser
         script: desktop_unittest.py
         no-read-buildbot-config: true
         config:
@@ -573,6 +578,7 @@ mochitest-chrome:
     mozharness:
         by-test-platform:
             android.*:
+                mochitest-flavor: chrome
                 script: android_emulator_unittest.py
                 no-read-buildbot-config: true
                 config:
@@ -584,6 +590,7 @@ mochitest-chrome:
                 extra-options:
                     - --test-suite=mochitest-chrome
             default:
+                mochitest-flavor: chrome
                 script: desktop_unittest.py
                 no-read-buildbot-config: true
                 chunked: true
@@ -613,6 +620,7 @@ mochitest-clipboard:
     mozharness:
         by-test-platform:
             android.*:
+                mochitest-flavor: plain
                 script: android_emulator_unittest.py
                 no-read-buildbot-config: true
                 config:
@@ -621,6 +629,7 @@ mochitest-clipboard:
                     # note that Android runs fewer suites than other platforms
                     - --test-suite=mochitest-plain-clipboard
             default:
+                mochitest-flavor: plain
                 script: desktop_unittest.py
                 no-read-buildbot-config: true
                 chunked: false
@@ -664,6 +673,7 @@ mochitest-devtools-chrome:
             macosx64/debug: true
             default: both
     mozharness:
+        mochitest-flavor: chrome
         script: desktop_unittest.py
         no-read-buildbot-config: true
         chunked: true
@@ -710,6 +720,7 @@ mochitest-gpu:
     mozharness:
         by-test-platform:
             android.*:
+                mochitest-flavor: plain
                 script: android_emulator_unittest.py
                 no-read-buildbot-config: true
                 config:
@@ -718,6 +729,7 @@ mochitest-gpu:
                     # note that Android runs fewer suites than other platforms
                     - --test-suite=mochitest-plain-gpu
             default:
+                mochitest-flavor: plain
                 script: desktop_unittest.py
                 no-read-buildbot-config: true
                 chunked: false
@@ -747,6 +759,7 @@ mochitest-jetpack:
             windows.*: ['mozilla-central', 'try']
             default: ['all']
     mozharness:
+        mochitest-flavor: jetpack-package
         script: desktop_unittest.py
         no-read-buildbot-config: true
         chunked: false
@@ -787,6 +800,7 @@ mochitest-media:
     mozharness:
         by-test-platform:
             android.*:
+                mochitest-flavor: plain
                 script: android_emulator_unittest.py
                 no-read-buildbot-config: true
                 config:
@@ -794,6 +808,7 @@ mochitest-media:
                 extra-options:
                     - --test-suite=mochitest-media
             default:
+                mochitest-flavor: plain
                 script: desktop_unittest.py
                 no-read-buildbot-config: true
                 chunked:
@@ -826,6 +841,7 @@ mochitest-valgrind:
     e10s: false
     allow-software-gl-layers: false
     mozharness:
+        mochitest-flavor: plain
         script: desktop_unittest.py
         no-read-buildbot-config: true
         chunked: true
@@ -870,6 +886,7 @@ mochitest-webgl:
     mozharness:
         by-test-platform:
             android.*:
+                mochitest-flavor: plain
                 script: android_emulator_unittest.py
                 no-read-buildbot-config: true
                 config:
@@ -877,6 +894,7 @@ mochitest-webgl:
                 extra-options:
                     - --test-suite=mochitest-gl
             default:
+                mochitest-flavor: plain
                 script: desktop_unittest.py
                 no-read-buildbot-config: true
                 chunked: true
@@ -904,6 +922,7 @@ mochitest-style:
             linux64-stylo/.*: [ 'stylo', 'autoland', 'mozilla-inbound', 'mozilla-central', 'try' ]
             default: ['all']
     mozharness:
+        mochitest-flavor: plain
         script: desktop_unittest.py
         no-read-buildbot-config: true
         config:

taskcluster/taskgraph/transforms/job/mozharness_test.py

@@ -85,8 +85,12 @@ def mozharness_test_on_docker(config, job, taskdesc):
         'MOZILLA_BUILD_URL': {'task-reference': installer_url},
         'NEED_PULSEAUDIO': 'true',
         'NEED_WINDOW_MANAGER': 'true',
+        'ENABLE_E10S': str(bool(test.get('e10s'))).lower(),
     }
 
+    if mozharness.get('mochitest-flavor'):
+        env['MOCHITEST_FLAVOR'] = mozharness['mochitest-flavor']
+
     if mozharness['set-moz-node-path']:
         env['MOZ_NODE_PATH'] = '/usr/local/bin/node'
 

taskcluster/taskgraph/transforms/tests.py

@@ -192,6 +192,9 @@ test_description_schema = Schema({
                 'test-platform',
                 [basestring]),
 
+            # mochitest flavor for mochitest runs
+            Optional('mochitest-flavor'): basestring,
+
             # any additional actions to pass to the mozharness command
             Optional('actions'): [basestring],