Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(124)

Unified Diff: scripts/slave/recipe_modules/chromium/api.py

Issue 1185693002: Move builders.py and steps.py to chromium_tests. (Closed) Base URL: https://chromium.googlesource.com/chromium/tools/build.git@master
Patch Set: Address review comments. Created 5 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 caea92bccf1bb4e179b7b1eadb39eec46316421d..479e0cd5532059e348714a061792241b723ae4eb 100644
--- a/scripts/slave/recipe_modules/chromium/api.py
+++ b/scripts/slave/recipe_modules/chromium/api.py
@@ -7,9 +7,6 @@ import re
from recipe_engine import recipe_api
from recipe_engine import util as recipe_util
-from . import builders
-from . import steps
-
class TestLauncherFilterFileInputPlaceholder(recipe_util.Placeholder):
def __init__(self, api, tests):
self.raw = api.m.raw_io.input('\n'.join(tests))
@@ -29,8 +26,6 @@ class ChromiumApi(recipe_api.RecipeApi):
def __init__(self, *args, **kwargs):
super(ChromiumApi, self).__init__(*args, **kwargs)
self._build_properties = None
- self._builders = {}
- self.add_builders(builders.BUILDERS)
def get_config_defaults(self):
return {
@@ -69,14 +64,6 @@ class ChromiumApi(recipe_api.RecipeApi):
return ret
@property
- def builders(self):
- return self._builders
-
- @property
- def steps(self):
- return steps
-
- @property
def build_properties(self):
return self._build_properties
@@ -111,10 +98,6 @@ class ChromiumApi(recipe_api.RecipeApi):
def set_build_properties(self, props):
self._build_properties = props
- def add_builders(self, builders):
- """Adds builders to our builder map"""
- self._builders.update(builders)
-
def configure_bot(self, builders_dict, additional_configs=None):
"""Sets up the configurations and gclient to be ready for bot update.
@@ -722,49 +705,6 @@ class ChromiumApi(recipe_api.RecipeApi):
'9d9a93134b3eabd003b85b4e7dea06c0eae150ed',
])
- def get_common_args_for_scripts(self):
- args = []
-
- args.extend(['--build-config-fs', self.c.build_config_fs])
-
- paths = {}
- for path in ('build', 'checkout'):
- paths[path] = self.m.path[path]
- args.extend(['--paths', self.m.json.input(paths)])
-
- properties = {}
- # TODO(phajdan.jr): Remove buildnumber when no longer used.
-
- 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['target_platform'] = self.c.TARGET_PLATFORM
-
- args.extend(['--properties', self.m.json.input(properties)])
-
- return args
-
- def get_compile_targets_for_scripts(self):
- return self.m.python(
- name='get compile targets for scripts',
- script=self.m.path['checkout'].join(
- 'testing', 'scripts', 'get_compile_targets.py'),
- args=[
- '--output', self.m.json.output(),
- '--',
- ] + self.get_common_args_for_scripts(),
- step_test_data=lambda: self.m.json.test_api.output({}))
-
def download_lto_plugin(self):
return self.m.python(
name='download LTO plugin',
« no previous file with comments | « scripts/slave/recipe_modules/auto_bisect/example.py ('k') | scripts/slave/recipe_modules/chromium/builders.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698