Bug 1624859 - [taskgraph] Remove 'bugbug' internal class in experimental optimization strategies, r=tomprince

It was making things more complicated.

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

taskcluster/ci/source-test/shadow-scheduler.yml

@@ -34,7 +34,7 @@ relevant_tests:
             TASKGRAPH_OPTIMIZE_STRATEGIES: taskgraph.optimize:experimental.relevant_tests
 
 bugbug_all:
-    description: Runs the bugbug.all optimization strategy instead of the default.
+    description: Runs the bugbug_all optimization strategy instead of the default.
     treeherder:
         symbol: SS(bugbug_all)
     index:
@@ -42,10 +42,10 @@ bugbug_all:
         job-name: shadow-scheduler-bugbug_all
     worker:
         env:
-            TASKGRAPH_OPTIMIZE_STRATEGIES: taskgraph.optimize:experimental.bugbug.all
+            TASKGRAPH_OPTIMIZE_STRATEGIES: taskgraph.optimize:experimental.bugbug_all
 
 bugbug_debug:
-    description: Runs the bugbug.debug optimization strategy instead of the default.
+    description: Runs the bugbug_debug optimization strategy instead of the default.
     treeherder:
         symbol: SS(bugbug_debug)
     index:
@@ -53,10 +53,10 @@ bugbug_debug:
         job-name: shadow-scheduler-bugbug_debug
     worker:
         env:
-            TASKGRAPH_OPTIMIZE_STRATEGIES: taskgraph.optimize:experimental.bugbug.debug
+            TASKGRAPH_OPTIMIZE_STRATEGIES: taskgraph.optimize:experimental.bugbug_debug
 
 bugbug_all_low:
-    description: Runs the bugbug.all optimization strategy (with a low confidence threshold) instead of the default.
+    description: Runs the bugbug_all optimization strategy (with a low confidence threshold) instead of the default.
     treeherder:
         symbol: SS(bugbug_all_low)
     index:
@@ -64,10 +64,10 @@ bugbug_all_low:
         job-name: shadow-scheduler-bugbug_all_low
     worker:
         env:
-            TASKGRAPH_OPTIMIZE_STRATEGIES: taskgraph.optimize:experimental.bugbug.all_low
+            TASKGRAPH_OPTIMIZE_STRATEGIES: taskgraph.optimize:experimental.bugbug_all_low
 
 bugbug_all_high:
-    description: Runs the bugbug.all optimization strategy (with a high confidence threshold) instead of the default.
+    description: Runs the bugbug_all optimization strategy (with a high confidence threshold) instead of the default.
     treeherder:
         symbol: SS(bugbug_all_high)
     index:
@@ -75,10 +75,10 @@ bugbug_all_high:
         job-name: shadow-scheduler-bugbug_all_high
     worker:
         env:
-            TASKGRAPH_OPTIMIZE_STRATEGIES: taskgraph.optimize:experimental.bugbug.all_high
+            TASKGRAPH_OPTIMIZE_STRATEGIES: taskgraph.optimize:experimental.bugbug_all_high
 
 bugbug_reduced:
-    description: Runs the bugbug.reduced optimization strategy instead of the default.
+    description: Runs the bugbug_reduced optimization strategy instead of the default.
     treeherder:
         symbol: SS(bugbug_reduced)
     index:
@@ -86,10 +86,10 @@ bugbug_reduced:
         job-name: shadow-scheduler-bugbug_reduced
     worker:
         env:
-            TASKGRAPH_OPTIMIZE_STRATEGIES: taskgraph.optimize:experimental.bugbug.reduced
+            TASKGRAPH_OPTIMIZE_STRATEGIES: taskgraph.optimize:experimental.bugbug_reduced
 
 bugbug_reduced_high:
-    description: Runs the bugbug.reduced optimization strategy (with a low confidence threshold) instead of the default.
+    description: Runs the bugbug_reduced optimization strategy (with a low confidence threshold) instead of the default.
     treeherder:
         symbol: SS(bugbug_reduced_high)
     index:
@@ -97,7 +97,7 @@ bugbug_reduced_high:
         job-name: shadow-scheduler-bugbug_reduced_high
     worker:
         env:
-            TASKGRAPH_OPTIMIZE_STRATEGIES: taskgraph.optimize:experimental.bugbug.reduced_high
+            TASKGRAPH_OPTIMIZE_STRATEGIES: taskgraph.optimize:experimental.bugbug_reduced_high
 
 seta:
     description: Runs the SETA optimization strategy instead of the default.

taskcluster/taskgraph/optimize/__init__.py

@@ -384,6 +384,37 @@ class experimental(object):
         ./mach try auto --strategy relevant_tests
     """
 
+    bugbug_all = {
+        'test': Any('skip-unless-schedules', 'bugbug-all'),
+    }
+    """Doesn't limit platforms, medium confidence threshold."""
+
+    bugbug_all_low = {
+        'test': Any('skip-unless-schedules', 'bugbug-all-low'),
+    }
+    """Doesn't limit platforms, low confidence threshold."""
+
+    bugbug_all_high = {
+        'test': Any('skip-unless-schedules', 'bugbug-all-high'),
+    }
+    """Doesn't limit platforms, high confidence threshold."""
+
+    bugbug_debug = {
+        'test': Any('skip-unless-schedules', 'bugbug-debug'),
+    }
+    """Restricts tests to debug platforms."""
+
+    bugbug_reduced = {
+        'test': Any('skip-unless-schedules', 'bugbug-reduced'),
+    }
+    """Use the reduced set of tasks (and no groups) chosen by bugbug."""
+
+    bugbug_reduced_high = {
+        'test': Any('skip-unless-schedules', 'bugbug-reduced-high'),
+    }
+    """Use the reduced set of tasks (and no groups) chosen by bugbug, high
+    confidence threshold."""
+
     relevant_tests = {
         'test': Any('skip-unless-schedules', 'skip-unless-has-relevant-tests'),
     }
@@ -394,38 +425,3 @@ class experimental(object):
     }
     """Provides a stable history of SETA's performance in the event we make it
     non-default in the future. Only useful as a benchmark."""
-
-    class bugbug(object):
-        """Strategies that query the bugbug push schedules endpoint which uses machine
-        learning to determine which tasks to run."""
-
-        all = {
-            'test': Any('skip-unless-schedules', 'bugbug-all'),
-        }
-        """Doesn't limit platforms, medium confidence threshold."""
-
-        all_low = {
-            'test': Any('skip-unless-schedules', 'bugbug-all-low'),
-        }
-        """Doesn't limit platforms, low confidence threshold."""
-
-        all_high = {
-            'test': Any('skip-unless-schedules', 'bugbug-all-high'),
-        }
-        """Doesn't limit platforms, high confidence threshold."""
-
-        debug = {
-            'test': Any('skip-unless-schedules', 'bugbug-debug'),
-        }
-        """Restricts tests to debug platforms."""
-
-        reduced = {
-            'test': Any('skip-unless-schedules', 'bugbug-reduced'),
-        }
-        """Use the reduced set of tasks (and no groups) chosen by bugbug."""
-
-        reduced_high = {
-            'test': Any('skip-unless-schedules', 'bugbug-reduced-high'),
-        }
-        """Use the reduced set of tasks (and no groups) chosen by bugbug, high
-        confidence threshold."""

tools/tryselect/selectors/auto.py

@@ -29,7 +29,7 @@ def run(message='{msg}', push=True, closed_tree=False, try_config=None):
     # XXX Remove once an intelligent scheduling algorithm is running on
     # autoland by default. This ensures `mach try auto` doesn't run SETA.
     try_config.setdefault('optimize-strategies',
-                          'taskgraph.optimize:experimental.bugbug.debug')
+                          'taskgraph.optimize:experimental.bugbug_debug')
 
     task_config = {
         'version': 2,

tools/tryselect/test/test_auto.t

@@ -17,7 +17,7 @@ Test auto selector
           "target_tasks_method": "try_auto",
           "try_mode": "try_auto",
           "try_task_config": {
-              "optimize-strategies": "taskgraph.optimize:experimental.bugbug.debug"
+              "optimize-strategies": "taskgraph.optimize:experimental.bugbug_debug"
           }
       },
       "version": 2
@@ -37,7 +37,7 @@ Test auto selector
           "target_tasks_method": "try_auto",
           "try_mode": "try_auto",
           "try_task_config": {
-              "optimize-strategies": "taskgraph.optimize:experimental.bugbug.debug"
+              "optimize-strategies": "taskgraph.optimize:experimental.bugbug_debug"
           }
       },
       "version": 2
@@ -56,7 +56,7 @@ Test auto selector
           "target_tasks_method": "try_auto",
           "try_mode": "try_auto",
           "try_task_config": {
-              "optimize-strategies": "taskgraph.optimize:experimental.bugbug.debug"
+              "optimize-strategies": "taskgraph.optimize:experimental.bugbug_debug"
           }
       },
       "version": 2