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

Unified Diff: scripts/slave/recipes/swarming/deterministic_build.py

Issue 2033513002: recipes: Switch from 3 ways for requesting clobber builds to 1 (Closed) Base URL: https://chromium.googlesource.com/chromium/tools/build@master
Patch Set: presubmit2 Created 4 years, 7 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/recipes/swarming/deterministic_build.py
diff --git a/scripts/slave/recipes/swarming/deterministic_build.py b/scripts/slave/recipes/swarming/deterministic_build.py
index 1521aa15eac7e9217eef748aa082dfa71c70d01a..d2f4c65af17bedd2dafb1507310fcdb83709adfc 100644
--- a/scripts/slave/recipes/swarming/deterministic_build.py
+++ b/scripts/slave/recipes/swarming/deterministic_build.py
@@ -79,6 +79,7 @@ def ConfigureChromiumBuilder(api, recipe_config):
api.chromium.set_config(recipe_config['chromium_config'],
**recipe_config.get('chromium_config_kwargs',
{'BUILD_CONFIG': 'Release'}))
+ api.chromium.apply_config('clobber')
api.gclient.set_config(recipe_config['gclient_config'],
**recipe_config.get('gclient_config_kwargs', {}))
@@ -101,6 +102,7 @@ def ConfigureAndroidBuilder(api, recipe_config):
'base_config', **kwargs)
api.chromium.set_config('base_config', **kwargs)
api.chromium.apply_config(recipe_config['chromium_config'])
+ api.chromium.apply_config('clobber')
PROPERTIES = {
'buildername': Property(),
@@ -132,7 +134,7 @@ def RunSteps(api, buildername):
# Do a first build and move the build artifact to the temp directory.
api.chromium.runhooks()
- api.chromium.compile(targets, force_clobber=True, name='First build')
+ api.chromium.compile(targets, name='First build')
api.isolate.remove_build_metadata()
if enable_isolate:
# This archives the results and regenerate the .isolated files.
@@ -142,7 +144,7 @@ def RunSteps(api, buildername):
# Do the second build and move the build artifact to the temp directory.
api.chromium.runhooks()
- api.chromium.compile(targets, force_clobber=True, name='Second build')
+ api.chromium.compile(targets, name='Second build')
api.isolate.remove_build_metadata()
if enable_isolate:
# This should be quick if the build is indeed deterministic.

Powered by Google App Engine
This is Rietveld 408576698