Chromium Code Reviews| Index: scripts/slave/recipe_modules/chromium/api.py |
| diff --git a/scripts/slave/recipe_modules/chromium/api.py b/scripts/slave/recipe_modules/chromium/api.py |
| index 19bb5343c8ecd73354e70a37bcc0b1778e715d0f..aa37b1eb57dbf0ec4c9e7aae94fa89062b2953d6 100644 |
| --- a/scripts/slave/recipe_modules/chromium/api.py |
| +++ b/scripts/slave/recipe_modules/chromium/api.py |
| @@ -704,8 +704,19 @@ class ChromiumApi(recipe_api.RecipeApi): |
| properties = {} |
| # TODO(phajdan.jr): Remove buildnumber when no longer used. |
| - for name in ('buildername', 'slavename', 'buildnumber'): |
| + |
| + mastername = self.m.properties.get('mastername') |
| + buildername = self.m.properties.get('buildername') |
| + master_dict = self.builders.get(mastername, {}) |
| + bot_config = master_dict.get('builders', {}).get(buildername, {}) |
| + |
| + for name in ('buildername', 'slavename', 'buildnumber', 'mastername'): |
| properties[name] = self.m.properties[name] |
| + |
| + # Optional properties |
|
shatch
2015/01/29 20:26:17
We talked a bit about this over email, mostly need
|
| + for name, value in bot_config.get('optional_properties', {}).iteritems(): |
| + properties[name] = value |
| + |
| args.extend(['--properties', self.m.json.input(properties)]) |
| return args |