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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: scripts/slave/recipes/chromium.chromedriver.recipe_autogen.py

Issue 2171093002: Switch ChromeDriver builders from GYP to GN. (Closed) Base URL: https://chromium.googlesource.com/chromium/tools/build.git@master
Patch Set: set args properly, and do the other bots too Created 4 years, 5 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 | « no previous file | scripts/slave/recipes/chromium.chromedriver.recipe_autogen.expected/Linux.json » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: scripts/slave/recipes/chromium.chromedriver.recipe_autogen.py
diff --git a/scripts/slave/recipes/chromium.chromedriver.recipe_autogen.py b/scripts/slave/recipes/chromium.chromedriver.recipe_autogen.py
index a9c3324a77971675bf1266b50feec515ebf12970..dbc6bb5124d1075c202c6d62ebee60f7ff71e589 100644
--- a/scripts/slave/recipes/chromium.chromedriver.recipe_autogen.py
+++ b/scripts/slave/recipes/chromium.chromedriver.recipe_autogen.py
@@ -53,27 +53,29 @@ def Linux32_steps(api):
build_properties.update(result.json.output.get('properties', {}))
# gclient update step; made unnecessary by bot_update
# gclient runhooks wrapper step
- env = {'CHROMIUM_GYP_SYNTAX_CHECK': '1', 'LANDMINES_VERBOSE': '1',
- 'DEPOT_TOOLS_UPDATE': '0',
- 'GYP_DEFINES':
- 'branding=Chrome buildtype=Official component=static_library'}
+ env = {'LANDMINES_VERBOSE': '1', 'DEPOT_TOOLS_UPDATE': '0'}
api.python("gclient runhooks wrapper", api.path["build"].join("scripts",
"slave", "runhooks_wrapper.py"), env=env)
# cleanup_temp step
api.chromium.cleanup_temp()
+ # meta build step
+ api.python("meta build", api.path["checkout"].join("tools", "mb", "mb.py"),
+ args=["gen", "-m", "chromium.chromedriver", "-b", "Linux32",
jbudorick 2016/07/22 02:58:31 I guess this is ok in the short term, but it shoul
samuong 2016/07/22 03:52:22 Done.
+ "//out/Default"])
# chromedriver compile.py step
api.python("compile", api.path["build"].join("scripts", "slave",
- "compile.py"), args=['--target', 'Release',
- 'chromium_builder_chromedriver'])
+ "compile.py"), args=['--target', 'Default',
+ 'chromedriver', 'chromedriver_tests', 'chromedriver_unittests'])
+ # strip binary
+ api.m.step('strip', cmd=['strip', str(api.path['checkout'].join(
+ 'out', 'Default', 'chromedriver'))])
# annotated_steps step
api.python("annotated_steps", api.path["build"].join("scripts", "slave",
"chromium", "chromedriver_buildbot_run.py"),
args=['--build-properties=%s' % api.json.dumps(build_properties,
separators=(',', ':')), '--factory-properties={"annotated_script":'+\
'"chromedriver_buildbot_run.py","blink_config":"chromium",'+\
- '"gclient_env":{"CHROMIUM_GYP_SYNTAX_CHECK":"1",'+\
- '"DEPOT_TOOLS_UPDATE"'':"0","GYP_DEFINES":"branding=Chrome '+\
- 'buildtype=Official component=static_library","LANDMINES_VERBOSE":'+\
+ '"gclient_env":{"DEPOT_TOOLS_UPDATE":"0","LANDMINES_VERBOSE":'+\
'"1"},"needs_webdriver_java_tests":true,"use_xvfb_on_linux":true}'],
allow_subannotations=True)
@@ -118,24 +120,29 @@ def Mac_10_6_steps(api):
build_properties.update(result.json.output.get('properties', {}))
# gclient update step; made unnecessary by bot_update
# gclient runhooks wrapper step
- env = {'CHROMIUM_GYP_SYNTAX_CHECK': '1', 'LANDMINES_VERBOSE': '1',
- 'DEPOT_TOOLS_UPDATE': '0', 'GYP_DEFINES': ' component=static_library'}
+ env = {'LANDMINES_VERBOSE': '1', 'DEPOT_TOOLS_UPDATE': '0'}
api.python("gclient runhooks wrapper", api.path["build"].join("scripts",
"slave", "runhooks_wrapper.py"), env=env)
# cleanup_temp step
api.chromium.cleanup_temp()
+ # meta build step
+ api.python("meta build", api.path["checkout"].join("tools", "mb", "mb.py"),
+ args=["gen", "-m", "chromium.chromedriver", "-b", "Mac 10.6",
+ "//out/Default"])
# chromedriver compile.py step
api.python("compile", api.path["build"].join("scripts", "slave",
- "compile.py"), args=['--target', 'Release',
- 'chromium_builder_chromedriver'])
+ "compile.py"), args=['--target', 'Default',
+ 'chromedriver', 'chromedriver_tests', 'chromedriver_unittests'])
+ # strip binary
+ api.m.step('strip', cmd=['strip', str(api.path['checkout'].join(
+ 'out', 'Default', 'chromedriver'))])
# annotated_steps step
api.python("annotated_steps", api.path["build"].join("scripts", "slave",
"chromium", "chromedriver_buildbot_run.py"),
args=['--build-properties=%s' % api.json.dumps(build_properties,
separators=(',', ':')), '--factory-properties={"annotated_script":"c'+\
'hromedriver_buildbot_run.py","blink_config":"chromium","gclient_e'+\
- 'nv":{"CHROMIUM_GYP_SYNTAX_CHECK":"1","DEPOT_TOOLS_UPDATE":"0","GYP'+\
- '_DEFINES":" component=static_library","LANDMINES_VERBOSE":"1"},"ne'+\
+ 'nv":{"DEPOT_TOOLS_UPDATE":"0","LANDMINES_VERBOSE":"1"},"ne'+\
'eds_webdriver_java_tests":true}'], allow_subannotations=True)
@@ -182,24 +189,26 @@ def Win7_steps(api):
build_properties.update(result.json.output.get('properties', {}))
# gclient update step; made unnecessary by bot_update
# gclient runhooks wrapper step
- env = {'CHROMIUM_GYP_SYNTAX_CHECK': '1', 'LANDMINES_VERBOSE': '1',
- 'DEPOT_TOOLS_UPDATE': '0','GYP_DEFINES': ' component=static_library'}
+ env = {'LANDMINES_VERBOSE': '1', 'DEPOT_TOOLS_UPDATE': '0'}
api.python("gclient runhooks wrapper", api.path["build"].join("scripts",
"slave", "runhooks_wrapper.py"), env=env)
# cleanup_temp step
api.chromium.cleanup_temp()
+ # meta build step
+ api.python("meta build", api.path["checkout"].join("tools", "mb", "mb.py"),
+ args=["gen", "-m", "chromium.chromedriver", "-b", "Win7",
+ "//out/Default"])
# chromedriver compile.py step
api.step("compile", ["python_slave", api.path["build"].join("scripts",
- "slave", "compile.py"), '--target', 'Release',
- 'chromium_builder_chromedriver'])
+ "slave", "compile.py"), '--target', 'Default',
+ 'chromedriver', 'chromedriver_tests', 'chromedriver_unittests'])
# annotated_steps step
api.step("annotated_steps", ["python_slave", api.path["build"].join("scripts",
"slave", "chromium", "chromedriver_buildbot_run.py"),
'--build-properties=%s' % api.json.dumps(build_properties,
separators=(',', ':')), '--factory-properties={"annotated_script":"chro'+\
'medriver_buildbot_run.py","blink_config":"chromium","gclient_env":'+\
- '{"CHROMIUM_GYP_SYNTAX_CHECK":"1","DEPOT_TOOLS_UPDATE":"0","GYP_DEF'+\
- 'INES":" component=static_library","LANDMINES_VERBOSE":"1"},"needs_'+\
+ '{"DEPOT_TOOLS_UPDATE":"0","LANDMINES_VERBOSE":"1"},"needs_'+\
'webdriver_java_tests":true}'], allow_subannotations=True)
@@ -243,27 +252,31 @@ def Linux_steps(api):
build_properties.update(result.json.output.get('properties', {}))
# gclient update step; made unnecessary by bot_update
# gclient runhooks wrapper step
- env = {'CHROMIUM_GYP_SYNTAX_CHECK': '1', 'LANDMINES_VERBOSE': '1',
- 'DEPOT_TOOLS_UPDATE': '0', 'GYP_DEFINES':
- 'branding=Chrome buildtype=Official component=static_library'}
+ env = {'LANDMINES_VERBOSE': '1', 'DEPOT_TOOLS_UPDATE': '0'}
api.python("gclient runhooks wrapper", api.path["build"].join("scripts",
"slave", "runhooks_wrapper.py"), env=env)
# cleanup_temp step
api.chromium.cleanup_temp()
+ # meta build step
+ api.python("meta build", api.path["checkout"].join("tools", "mb", "mb.py"),
+ args=["gen", "-m", "chromium.chromedriver", "-b", "Linux",
+ "//out/Default"])
# chromedriver compile.py step
api.python("compile", api.path["build"].join("scripts", "slave",
- "compile.py"), args=['--target', 'Release',
- 'chromium_builder_chromedriver'])
+ "compile.py"), args=['--target', 'Default',
+ 'chromedriver', 'chromedriver_tests', 'chromedriver_unittests'])
+ # strip binary
+ api.m.step('strip', cmd=['strip', str(api.path['checkout'].join(
+ 'out', 'Default', 'chromedriver'))])
# annotated_steps step
api.python("annotated_steps", api.path["build"].join("scripts", "slave",
"chromium", "chromedriver_buildbot_run.py"),
args=['--build-properties=%s' % api.json.dumps(build_properties,
separators=(',', ':')), '--factory-properties={"annotated_script":"chro'+\
'medriver_buildbot_run.py","blink_config":"chromium","gclient_env":'+\
- '{"CHROMIUM_GYP_SYNTAX_CHECK":"1","DEPOT_TOOLS_UPDATE":"0","GYP_DEF'+\
- 'INES":"branding=Chrome buildtype=Official component=static_library'+\
- '","LANDMINES_VERBOSE":"1"},"needs_webdriver_java_tests":true,"use_'+\
- 'xvfb_on_linux":true}'], allow_subannotations=True)
+ '{"DEPOT_TOOLS_UPDATE":"0","LANDMINES_VERBOSE":"1"},"needs_webdrive'+\
+ 'r_java_tests":true,"use_xvfb_on_linux":true}'],
+ allow_subannotations=True)
dispatch_directory = {
« no previous file with comments | « no previous file | scripts/slave/recipes/chromium.chromedriver.recipe_autogen.expected/Linux.json » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698