Bug 1295225 - Allow regex in taskcluster by-test-platform; r=dustin

taskcluster/ci/desktop-test/tests.yml

@@ -14,6 +14,13 @@ cppunit:
         script: mozharness/scripts/desktop_unittest.py
         no-read-buildbot-config: true
         config:
+            by-test-platform:
+                # Coming soon:
+                # win.*:
+                #    - mozharness/configs/unittests/win_unittest.py
+                #    - mozharness/configs/remove_executables.py
+                # ...
+                default:
                     - mozharness/configs/unittests/linux_unittest.py
                     - mozharness/configs/remove_executables.py
         extra-options:
@@ -28,6 +35,8 @@ crashtest:
         chunked: true
         no-read-buildbot-config: true
         config:
+            by-test-platform:
+                default:
                     - mozharness/configs/unittests/linux_unittest.py
                     - mozharness/configs/remove_executables.py
         extra-options:
@@ -87,6 +96,8 @@ gtest:
         script: mozharness/scripts/desktop_unittest.py
         no-read-buildbot-config: true
         config:
+            by-test-platform:
+                default:
                     - mozharness/configs/unittests/linux_unittest.py
                     - mozharness/configs/remove_executables.py
         extra-options:
@@ -102,6 +113,8 @@ jittests:
         script: mozharness/scripts/desktop_unittest.py
         no-read-buildbot-config: true
         config:
+            by-test-platform:
+                default:
                     - mozharness/configs/unittests/linux_unittest.py
                     - mozharness/configs/remove_executables.py
         extra-options:
@@ -116,6 +129,8 @@ jsreftest:
         script: mozharness/scripts/desktop_unittest.py
         no-read-buildbot-config: true
         config:
+            by-test-platform:
+                default:
                     - mozharness/configs/unittests/linux_unittest.py
                     - mozharness/configs/remove_executables.py
         extra-options:
@@ -145,6 +160,8 @@ mochitest:
         no-read-buildbot-config: true
         chunked: true
         config:
+            by-test-platform:
+                default:
                     - mozharness/configs/unittests/linux_unittest.py
                     - mozharness/configs/remove_executables.py
         extra-options:
@@ -161,6 +178,8 @@ mochitest-a11y:
         no-read-buildbot-config: true
         chunked: true
         config:
+            by-test-platform:
+                default:
                     - mozharness/configs/unittests/linux_unittest.py
                     - mozharness/configs/remove_executables.py
         extra-options:
@@ -180,6 +199,8 @@ mochitest-browser-chrome:
         script: mozharness/scripts/desktop_unittest.py
         no-read-buildbot-config: true
         config:
+            by-test-platform:
+                default:
                     - mozharness/configs/unittests/linux_unittest.py
                     - mozharness/configs/remove_executables.py
         extra-options:
@@ -196,6 +217,8 @@ mochitest-chrome:
         script: mozharness/scripts/desktop_unittest.py
         no-read-buildbot-config: true
         config:
+            by-test-platform:
+                default:
                     - mozharness/configs/unittests/linux_unittest.py
                     - mozharness/configs/remove_executables.py
         extra-options:
@@ -212,6 +235,8 @@ mochitest-clipboard:
         no-read-buildbot-config: true
         chunked: true
         config:
+            by-test-platform:
+                default:
                     - mozharness/configs/unittests/linux_unittest.py
                     - mozharness/configs/remove_executables.py
         extra-options:
@@ -233,6 +258,8 @@ mochitest-devtools-chrome:
         script: mozharness/scripts/desktop_unittest.py
         no-read-buildbot-config: true
         config:
+            by-test-platform:
+                default:
                     - mozharness/configs/unittests/linux_unittest.py
                     - mozharness/configs/remove_executables.py
         extra-options:
@@ -248,6 +275,8 @@ mochitest-gpu:
         no-read-buildbot-config: true
         chunked: true
         config:
+            by-test-platform:
+                default:
                     - mozharness/configs/unittests/linux_unittest.py
                     - mozharness/configs/remove_executables.py
         extra-options:
@@ -265,6 +294,8 @@ mochitest-jetpack:
         no-read-buildbot-config: true
         chunked: true
         config:
+            by-test-platform:
+                default:
                     - mozharness/configs/unittests/linux_unittest.py
                     - mozharness/configs/remove_executables.py
         extra-options:
@@ -283,6 +314,8 @@ mochitest-media:
         no-read-buildbot-config: true
         chunked: true
         config:
+            by-test-platform:
+                default:
                     - mozharness/configs/unittests/linux_unittest.py
                     - mozharness/configs/remove_executables.py
         extra-options:
@@ -299,6 +332,8 @@ mochitest-webgl:
         no-read-buildbot-config: true
         chunked: true
         config:
+            by-test-platform:
+                default:
                     - mozharness/configs/unittests/linux_unittest.py
                     - mozharness/configs/remove_executables.py
         extra-options:
@@ -313,6 +348,8 @@ reftest:
         script: mozharness/scripts/desktop_unittest.py
         no-read-buildbot-config: true
         config:
+            by-test-platform:
+                default:
                     - mozharness/configs/unittests/linux_unittest.py
                     - mozharness/configs/remove_executables.py
         extra-options:
@@ -327,6 +364,8 @@ reftest-no-accel:
         script: mozharness/scripts/desktop_unittest.py
         no-read-buildbot-config: true
         config:
+            by-test-platform:
+                default:
                     - mozharness/configs/unittests/linux_unittest.py
                     - mozharness/configs/remove_executables.py
         extra-options:
@@ -379,6 +418,8 @@ xpcshell:
         script: mozharness/scripts/desktop_unittest.py
         no-read-buildbot-config: true
         config:
+            by-test-platform:
+                default:
                     - mozharness/configs/unittests/linux_unittest.py
                     - mozharness/configs/remove_executables.py
         extra-options:

taskcluster/taskgraph/transforms/base.py

@@ -4,6 +4,7 @@
 
 from __future__ import absolute_import, print_function, unicode_literals
 
+import re
 import voluptuous
 
 
@@ -77,8 +78,9 @@ def get_keyed_by(item, field, item_name, subfield=None):
     other attribute of the item, perform that lookup.  For example, this supports
 
         chunks:
-            by-item-platform:
+            by-test-platform:
                 macosx-10.11/debug: 13
+                win.*: 6
                 default: 12
 
     The `item_name` parameter is used to generate useful error messages.
@@ -87,7 +89,7 @@ def get_keyed_by(item, field, item_name, subfield=None):
 
         mozharness:
             config:
-                by-item-platform:
+                by-test-platform:
                     default: ...
     """
     value = item[field]
@@ -103,6 +105,13 @@ def get_keyed_by(item, field, item_name, subfield=None):
     values = value[keyed_by]
     if keyed_by.startswith('by-'):
         keyed_by = keyed_by[3:]  # extract just the keyed-by field name
+        if item[keyed_by] in values:
+            return values[item[keyed_by]]
+        for k in values.keys():
+            if re.match(k, item[keyed_by]):
+                return values[k]
+        if 'default' in values:
+            return values['default']
         for k in item[keyed_by], 'default':
             if k in values:
                 return values[k]