Bug 1350413 part 2: Fix generic-worker configuration. r=dustin

* Add macosx64 talos tests configuration.
* Fix logs artifacts.
* jittest doesn't have blob_upload_dir.
* e10s config on talos goes on suite name.

MozReview-Commit-ID: E9rSv2zQqvL

--HG--
extra : rebase_source : aa931c26ab887569724c0847c4a9c25a2c04c584

taskcluster/ci/test/tests.yml

@@ -1165,11 +1165,16 @@ talos-chrome:
         no-read-buildbot-config: true
         config:
             by-test-platform:
+                macosx.*:
+                    - remove_executables.py
+                    - talos/mac_config.py
                 default:
                     - talos/linux_config.py
                     - remove_executables.py
         extra-options:
             - --suite=chromez
+            - --add-option
+            - --webServer,localhost
 
 talos-dromaeojs:
     description: "Talos dromaeojs"
@@ -1186,11 +1191,16 @@ talos-dromaeojs:
         no-read-buildbot-config: true
         config:
             by-test-platform:
+                macosx.*:
+                    - remove_executables.py
+                    - talos/mac_config.py
                 default:
                     - talos/linux_config.py
                     - remove_executables.py
         extra-options:
             - --suite=dromaeojs
+            - --add-option
+            - --webServer,localhost
 
 talos-g1:
     description: "Talos g1"
@@ -1207,11 +1217,16 @@ talos-g1:
         no-read-buildbot-config: true
         config:
             by-test-platform:
+                macosx.*:
+                    - remove_executables.py
+                    - talos/mac_config.py
                 default:
                     - talos/linux_config.py
                     - remove_executables.py
         extra-options:
             - --suite=g1
+            - --add-option
+            - --webServer,localhost
 
 talos-g2:
     description: "Talos g2"
@@ -1228,11 +1243,16 @@ talos-g2:
         no-read-buildbot-config: true
         config:
             by-test-platform:
+                macosx.*:
+                    - remove_executables.py
+                    - talos/mac_config.py
                 default:
                     - talos/linux_config.py
                     - remove_executables.py
         extra-options:
             - --suite=g2
+            - --add-option
+            - --webServer,localhost
 
 talos-g3:
     description: "Talos g3"
@@ -1249,11 +1269,16 @@ talos-g3:
         no-read-buildbot-config: true
         config:
             by-test-platform:
+                macosx.*:
+                    - remove_executables.py
+                    - talos/mac_config.py
                 default:
                     - talos/linux_config.py
                     - remove_executables.py
         extra-options:
             - --suite=g3
+            - --add-option
+            - --webServer,localhost
 
 talos-g4:
     description: "Talos g4"
@@ -1270,11 +1295,16 @@ talos-g4:
         no-read-buildbot-config: true
         config:
             by-test-platform:
+                macosx.*:
+                    - remove_executables.py
+                    - talos/mac_config.py
                 default:
                     - talos/linux_config.py
                     - remove_executables.py
         extra-options:
             - --suite=g4
+            - --add-option
+            - --webServer,localhost
 
 talos-other:
     description: "Talos other"
@@ -1291,11 +1321,16 @@ talos-other:
         no-read-buildbot-config: true
         config:
             by-test-platform:
+                macosx.*:
+                    - remove_executables.py
+                    - talos/mac_config.py
                 default:
                     - talos/linux_config.py
                     - remove_executables.py
         extra-options:
             - --suite=other
+            - --add-option
+            - --webServer,localhost
 
 talos-perf-reftest:
     description: "Talos perf-reftest"
@@ -1333,11 +1368,16 @@ talos-svgr:
         no-read-buildbot-config: true
         config:
             by-test-platform:
+                macosx.*:
+                    - remove_executables.py
+                    - talos/mac_config.py
                 default:
                     - talos/linux_config.py
                     - remove_executables.py
         extra-options:
             - --suite=svgr
+            - --add-option
+            - --webServer,localhost
 
 talos-tp5o:
     description: "Talos tp5o"
@@ -1354,11 +1394,16 @@ talos-tp5o:
         no-read-buildbot-config: true
         config:
             by-test-platform:
+                macosx.*:
+                    - remove_executables.py
+                    - talos/mac_config.py
                 default:
                     - talos/linux_config.py
                     - remove_executables.py
         extra-options:
             - --suite=tp5o
+            - --add-option
+            - --webServer,localhost
 
 web-platform-tests:
     description: "Web platform test run"

taskcluster/taskgraph/transforms/job/mozharness_test.py

@@ -176,39 +176,9 @@ def mozharness_test_on_generic_worker(config, job, taskdesc):
 
     artifacts = [
         {
-            'name': 'public/logs/localconfig.json',
-            'path': 'logs/localconfig.json',
-            'type': 'file'
-        },
-        {
-            'name': 'public/logs/log_critical.log',
-            'path': 'logs/log_critical.log',
-            'type': 'file'
-        },
-        {
-            'name': 'public/logs/log_error.log',
-            'path': 'logs/log_error.log',
-            'type': 'file'
-        },
-        {
-            'name': 'public/logs/log_fatal.log',
-            'path': 'logs/log_fatal.log',
-            'type': 'file'
-        },
-        {
-            'name': 'public/logs/log_info.log',
-            'path': 'logs/log_info.log',
-            'type': 'file'
-        },
-        {
-            'name': 'public/logs/log_raw.log',
-            'path': 'logs/log_raw.log',
-            'type': 'file'
-        },
-        {
-            'name': 'public/logs/log_warning.log',
-            'path': 'logs/log_warning.log',
-            'type': 'file'
+            'name': 'public/logs',
+            'path': 'logs',
+            'type': 'directory'
         },
     ]
 
@@ -295,6 +265,9 @@ def mozharness_test_on_generic_worker(config, job, taskdesc):
             mh_command.extend(['--download-symbols', mozharness['download-symbols']])
         else:
             mh_command.extend(['--download-symbols', 'true'])
+    if mozharness.get('include-blob-upload-branch'):
+        mh_command.append('--blob-upload-branch=' + config.params['project'])
+    mh_command.extend(mozharness.get('extra-options', []))
 
     # TODO: remove the need for run['chunked']
     if mozharness.get('chunked') or test['chunks'] > 1:

taskcluster/taskgraph/transforms/tests.py

@@ -540,7 +540,12 @@ def split_e10s(config, tests):
             if group != '?':
                 group += '-e10s'
             test['treeherder-symbol'] = join_symbol(group, symbol)
-            test['mozharness']['extra-options'].append('--e10s')
+            if test['suite'] == 'talos':
+                for i, option in enumerate(test['mozharness']['extra-options']):
+                    if option.startswith('--suite='):
+                        test['mozharness']['extra-options'][i] += '-e10s'
+            else:
+                test['mozharness']['extra-options'].append('--e10s')
         yield test