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..50b591c4aa467c056ad788540ea0fe8b22293ef9 100644 |
| --- a/scripts/slave/recipe_modules/chromium/api.py |
| +++ b/scripts/slave/recipe_modules/chromium/api.py |
| @@ -704,8 +704,22 @@ 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 |
| + for name in ('perf-id', 'results-url'): |
| + if bot_config.get(name): |
| + properties[name] = bot_config[name] |
| + |
| + properties['android_mode'] = self.c.TARGET_PLATFORM == 'android' |
|
Paweł Hajdan Jr.
2015/02/23 20:44:18
Why not pass the value of TARGET_PLATFORM instead?
shatch
2015/02/23 21:05:55
Done.
|
| + |
| args.extend(['--properties', self.m.json.input(properties)]) |
| return args |