Merge 4d51f3e into 25800da

mozci/mozci.py

@@ -560,12 +560,20 @@ def trigger(builder, revision, files=[], dry_run=False, extra_properties=None):
 
 def trigger_all_talos_jobs(repo_name, revision, times, priority=0, dry_run=False):
     """
-    Trigger talos jobs (excluding 'pgo') for a given revision.
+    Trigger all talos jobs (excluding 'pgo') for a given revision.
+    """
+    trigger_talos_jobs(repo_name, revision, times, priority, dry_run, None)
+
+
+def trigger_talos_jobs(repo_name, revision, times, priority=0, dry_run=False, buildername=None):
+    """
+    Trigger talos jobs (excluding 'pgo') for a given revision and build.
+    If buildername is None, all Talos jobs are executed.
     """
     pgo = False
     if repo_name in ['mozilla-central', 'mozilla-aurora', 'mozilla-beta']:
         pgo = True
-    buildernames = build_talos_buildernames_for_repo(repo_name, pgo)
+    buildernames = build_talos_buildernames_for_repo(repo_name, pgo, buildername)
     for buildername in buildernames:
         trigger_range(buildername=buildername,
                       revisions=[revision],

mozci/platforms.py

@@ -385,9 +385,10 @@ def build_tests_per_platform_graph(builders):
     return graph
 
 
-def build_talos_buildernames_for_repo(repo_name, pgo_only=False):
+def build_talos_buildernames_for_repo(repo_name, pgo_only=False, buildername=None):
     """
     This function aims to generate all possible talos jobs for a given branch.
+    If buildername is not None, we get talos jobs for only that build
 
     Here we take the list of talos buildernames for a given branch.   When
     we want pgo, we build a list of pgo buildernames, then find the non-pgo builders
@@ -398,7 +399,12 @@ def build_talos_buildernames_for_repo(repo_name, pgo_only=False):
     """
     buildernames = list_builders()
     retVal = []
-
+    if buildername:
+        # Look for the buildername in buildernames
+        if buildername in buildernames:
+            buildernames = [buildername]
+        else:
+            buildernames = []
     # Android and OSX do not have PGO, so we need to get those specific jobs
     pgo_re = re.compile(".*%s pgo talos.*" % repo_name)
     talos_re = re.compile(".*%s talos.*" % repo_name)