Pass mb_mastername and mb_buildername as parameters to override the default.

scripts/slave/recipe_modules/filter/api.py

Index: scripts/slave/recipe_modules/filter/api.py
diff --git a/scripts/slave/recipe_modules/filter/api.py b/scripts/slave/recipe_modules/filter/api.py
index 359c2a41fd41ff613af68a88497effc3d021f945..7e41a5fbe6ea15e515903044942f3ac781cfd403 100644
--- a/scripts/slave/recipe_modules/filter/api.py
+++ b/scripts/slave/recipe_modules/filter/api.py
@@ -160,14 +160,23 @@ class FilterApi(recipe_api.RecipeApi):
         # Ensure that mb runs in a clean environment to avoid
         # picking up any GYP_DEFINES accidentally.
         del kwargs['env']
+      # We need to use the actual mastername and buildername we're running on,

[Paweł Hajdan Jr., 2015/11/25 16:29:15]

I think it'd make sense to also plumb mastername and buildername here.

+      # because it may be configured with different MB settings from those for
+      # the continuous builder a trybot may be configured to match.
+      # However, recipes used by Findit may override the defaults to be able to
+      # exactly match a given continuous builder.
+      target_mastername = (self.m.properties.get('target_mastername') or
+                           self.m.properties['mastername'])
+      target_buildername = (self.m.properties.get('target_buildername') or
+                            self.m.properties['buildername'])
       step_result = self.m.python(
           'analyze',
           self.m.path['checkout'].join('tools', 'mb', 'mb.py'),
           args=['analyze',
                 '-m',
-                self.m.properties['mastername'],
+                target_mastername,
                 '-b',
-                self.m.properties['buildername'],
+                target_buildername,
                 '-v',
                 build_output_dir,
                 self.m.json.input(analyze_input),