Bug 1650406 - [ci] Ensure 'test-verify' tasks use the 'test' strategy with |mach try auto|, r=marco

Differential Revision: https://phabricator.services.mozilla.com/D88873

taskcluster/ci/test/misc.yml

@@ -57,6 +57,8 @@ test-verify:
         by-test-platform:
             android-em-7.*: geckoview-androidTest.apk
             default: null
+    optimization:
+        test-verify: ["test-verify"]
     tier: 2
     mozharness:
         script:
@@ -110,7 +112,6 @@ test-verify-gpu:
     suite:
         category: test-verify
         name: test-verify-gpu
-    schedules-component: test-verify-gpu
     treeherder-symbol: TVg
     loopback-video: true
     virtualization: virtual-with-gpu
@@ -125,6 +126,8 @@ test-verify-gpu:
             # do not run on mozilla-central, beta or release: usually just confirms earlier results
             default: ['integration']
     built-projects-only: true
+    optimization:
+        test-verify: ["test-verify-gpu"]
     tier: 2
     mozharness:
         script:

taskcluster/ci/test/web-platform.yml

@@ -298,7 +298,6 @@ test-verify-wpt:
         category: test-verify
         name: test-verify-wpt
     variants: []
-    schedules-component: test-verify-wpt
     treeherder-symbol: TVw
     max-run-time: 10800
     run-on-projects:
@@ -310,6 +309,8 @@ test-verify-wpt:
             # do not run on beta or release: usually just confirms earlier results
             default: ['integration']
     built-projects-only: true
+    optimization:
+        test-verify: ["test-verify-wpt"]
     tier: 2
     mozharness:
         extra-options:

taskcluster/taskgraph/optimize/__init__.py

@@ -493,6 +493,7 @@ register_strategy('build', args=('skip-unless-schedules',))(Alias)
 register_strategy('build-fuzzing', args=('push-interval-10', 'backstop'))(All)
 register_strategy('test', args=('skip-unless-schedules',))(Alias)
 register_strategy('test-inclusive', args=('skip-unless-schedules',))(Alias)
+register_strategy('test-verify', args=('skip-unless-schedules',))(Alias)
 
 
 # Strategy overrides used to tweak the default strategies. These are referenced
@@ -660,11 +661,16 @@ class ExperimentalOverride(object):
 
     def __getattr__(self, name):
         val = getattr(self.base, name).copy()
-        val.update(self.overrides)
+        for name, strategy in self.overrides.items():
+            if isinstance(strategy, str) and strategy.startswith('base:'):
+                strategy = val[strategy[len('base:'):]]
+
+            val[name] = strategy
         return val
 
 
 tryselect = ExperimentalOverride(experimental, {
     'build': Any('skip-unless-schedules', 'bugbug-reduced', split_args=split_bugbug_arg),
     'build-fuzzing': Alias('bugbug-reduced'),
+    'test-verify': 'base:test',
 })

taskcluster/taskgraph/util/schema.py

@@ -235,6 +235,8 @@ OptimizationSchema = voluptuous.Any(
     # optimize strategy aliases for the test kind
     {'test': list(schedules.ALL_COMPONENTS)},
     {'test-inclusive': list(schedules.ALL_COMPONENTS)},
+    # optimize strategy alias for test-verify tasks
+    {'test-verify': list(schedules.ALL_COMPONENTS)},
 )
 
 # shortcut for a string where task references are allowed