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

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

Issue 137993010: Added support for properly building and running isolates in recipes. (Closed) Base URL: https://chromium.googlesource.com/chromium/tools/build.git@master
Patch Set: Added missed files. Created 6 years, 11 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
« no previous file with comments | « scripts/slave/recipe_modules/isolate/__init__.py ('k') | scripts/slave/recipes/gpu/build_and_test.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: scripts/slave/recipe_modules/isolate/api.py
diff --git a/scripts/slave/recipe_modules/isolate/api.py b/scripts/slave/recipe_modules/isolate/api.py
index 8696c7d8ad8c0279307411d4039b8b0f2b6517e1..9ccae69b9c7f643615c33fc59f22eb40d5c35685 100644
--- a/scripts/slave/recipe_modules/isolate/api.py
+++ b/scripts/slave/recipe_modules/isolate/api.py
@@ -4,17 +4,34 @@
from slave import recipe_api
+ISOLATE_SERVER = 'https://isolateserver.appspot.com'
+
class IsolateApi(recipe_api.RecipeApi):
"""APIs for interacting with isolates."""
+ def __init__(self, **kwargs):
+ super(IsolateApi, self).__init__(**kwargs)
+ self._manifest_hashes = {}
+
+ def set_isolate_environment(self, config):
+ """Modifies the passed Config (which should generally be api.chromium.c)
+ to set up the appropriate GYP_DEFINES to upload isolates to the isolate
+ server during the build. This must be called early in your recipe;
+ definitely before the checkout and runhooks steps."""
+ assert config.gyp_env.GYP_DEFINES['component'] != 'shared_library', (
+ "isolates don't work with the component build yet; see crbug.com/333473")
+ config.gyp_env.GYP_DEFINES['test_isolation_mode'] = 'hashtable'
+ config.gyp_env.GYP_DEFINES['test_isolation_outdir'] = ISOLATE_SERVER
+
@recipe_api.inject_test_data
def manifest_to_hash(self, targets):
"""Returns a step which runs manifest_to_hash.py against the given array
of targets. Assigns the result to the swarm_hashes factory property.
(This implies this step can currently only be run once per recipe.)"""
def followup_fn(step_result):
+ self._manifest_hashes = step_result.json.output
step_result.presentation.properties['swarm_hashes'] = (
- step_result.json.output)
+ self._manifest_hashes)
return self.m.python(
'manifest_to_hash',
self.m.path.build('scripts', 'slave', 'swarming', 'manifest_to_hash.py'),
@@ -22,3 +39,42 @@ class IsolateApi(recipe_api.RecipeApi):
'--output-json', self.m.json.output(),
] + targets,
followup_fn=followup_fn)
+
+ @property
+ def manifest_hashes(self):
+ """Returns the dictionary of hashes that have been produced during this
+ run. These come either from the incoming swarm_hashes factory property,
+ or from calling manifest_to_hash, above, at some point during the
+ run."""
+ return self.m.properties.get('swarm_hashes', self._manifest_hashes)
+
+ def run_isolate_test(self, test, args=None, name=None, **runtest_kwargs):
+ """Runs a test which has previously been uploaded to the isolate server.
+ Expects to find the test 'test' as a key in the manifest_hashes
+ dictionary. Delegates to api.chromium.runtests; see that method for a
+ more complete description of the supported arguments."""
+ isolate_hash = self.manifest_hashes[test]
+
+ name = name or test
+
+ # TODO(kbr): will need this later. Comment out for now for code coverage.
+ # The step name must end in 'test' or 'tests' in order for the results to
+ # automatically show up on the flakiness dashboard.
+ # if not (name.endswith('test') or name.endswith('tests')):
+ # name = '%s_tests' % name
+
+ if not args:
+ args = []
+
+ full_args = [
+ '-H',
+ isolate_hash,
+ '-I',
+ ISOLATE_SERVER
+ ] + args
+
+ return self.m.chromium.runtests(
+ self.m.path.checkout('tools', 'swarming_client', 'run_isolated.py'),
+ args=full_args,
+ name=name,
+ **runtest_kwargs)
« no previous file with comments | « scripts/slave/recipe_modules/isolate/__init__.py ('k') | scripts/slave/recipes/gpu/build_and_test.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698