Chromium Code Reviews| Index: scripts/slave/recipes/chromium.fyi.misc_block.recipe_autogen.py |
| diff --git a/scripts/slave/recipes/chromium.fyi.misc_block.recipe_autogen.py b/scripts/slave/recipes/chromium.fyi.misc_block.recipe_autogen.py |
| index d5c235337c2eb23338e755e9dcf35eb7b7b1baf3..b63008e1ec51af88ccebb70ef252ba40fce769c3 100644 |
| --- a/scripts/slave/recipes/chromium.fyi.misc_block.recipe_autogen.py |
| +++ b/scripts/slave/recipes/chromium.fyi.misc_block.recipe_autogen.py |
| @@ -63,76 +63,8 @@ def Android_ChromeDriver_Tests__dbg__steps(api): |
| allow_subannotations=True) |
| -def CFI_Linux_CF_steps(api): |
| - build_properties = api.properties.legacy() |
| - # update scripts step; implicitly run by recipe engine. |
| - # bot_update step |
| - src_cfg = api.gclient.make_config(GIT_MODE=True) |
| - soln = src_cfg.solutions.add() |
| - soln.name = "src" |
| - soln.url = "https://chromium.googlesource.com/chromium/src.git" |
| - soln.custom_deps = {'src/third_party/WebKit/LayoutTests': None} |
| - soln.custom_vars = {'webkit_trunk': 'http://src.chromium.org/blink/trunk', |
| - 'googlecode_url': 'http://%s.googlecode.com/svn', |
| - 'nacl_trunk': |
| - 'http://src.chromium.org/native_client/trunk', |
| - 'sourceforge_url': |
| - 'https://svn.code.sf.net/p/%(repo)s/code', |
| - 'llvm_url': 'http://llvm.org/svn/llvm-project'} |
| - src_cfg.got_revision_mapping.update( |
| - {'src': 'got_revision', |
| - 'src/third_party/WebKit': 'got_webkit_revision', |
| - 'src/tools/swarming_client': 'got_swarming_client_revision', |
| - 'src/v8': 'got_v8_revision'}) |
| - api.gclient.c = src_cfg |
| - result = api.bot_update.ensure_checkout(force=True) |
| - build_properties.update(result.json.output.get("properties", {})) |
| - |
| - # clobber before runhooks |
| - api.file.rmtree('clobber', api.path['checkout'].join('out', 'Release')) |
| - |
| - # gclient revert step; made unnecessary by bot_update |
| - # gclient update step; made unnecessary by bot_update |
| - # gclient runhooks wrapper step |
|
Nico
2016/06/09 20:36:55
this function is what controlled the bot in the re
|
| - env = {'CHROMIUM_GYP_SYNTAX_CHECK': '1', |
| - 'LANDMINES_VERBOSE': '1', |
| - 'DEPOT_TOOLS_UPDATE': '0', |
| - 'GYP_DEFINES': ' component=static_library', |
| - 'LLVM_DOWNLOAD_GOLD_PLUGIN': '1'} |
| - api.python("gclient runhooks wrapper", |
| - api.path["build"].join("scripts", "slave", |
| - "runhooks_wrapper.py"), |
| - env=env) |
| - # cleanup_temp step |
| - api.chromium.cleanup_temp() |
| - # compile.py step |
| - args = ['--target', 'Release', 'chromium_builder_asan'] |
| - api.python("compile", |
| - api.path["build"].join("scripts", "slave", "compile.py"), |
| - args=args) |
| - # ClusterFuzz Archive step |
| - # HACK(aneeshm): chromium_utils fails without this. |
| - build_properties["primary_repo"] = "" |
| - api.python( |
| - 'ClusterFuzz Archive', |
| - api.path["build"].join("scripts", "slave", "chromium", |
| - "cf_archive_build.py"), |
| - args= |
| - ['--target', 'Release', "--build-properties=%s" % |
| - api.json.dumps(build_properties, |
| - separators=(',', ':')), |
| - ('--factory-properties={"blink_config":"chromium","cf_archive_build":' |
| - 'true,"cf_archive_name":"cfi","gclient_env":' |
| - '{"CHROMIUM_GYP_SYNTAX_CHECK":"1","DEPOT_TOOLS_UPDATE":"0",' |
| - '"GYP_DEFINES":" component=static_library","LANDMINES_VERBOSE":"1",' |
| - '"LLVM_DOWNLOAD_GOLD_PLUGIN":"1"},"gs_acl":"public-read",' |
| - '"gs_bucket":"gs://chromium-browser-cfi"}')], |
| - cwd=api.path["slave_build"]) |
| - |
| - |
| dispatch_directory = { |
| 'Android ChromeDriver Tests (dbg)': Android_ChromeDriver_Tests__dbg__steps, |
| - 'CFI Linux CF': CFI_Linux_CF_steps, |
| } |
| @@ -152,14 +84,6 @@ def GenTests(api): |
| api.properties(buildnumber='42') + |
| api.properties(slavename='TestSlave') |
| ) |
| - yield (api.test('CFI_Linux_CF') + |
| - api.properties(mastername='chromium.fyi') + |
| - api.properties(buildername='CFI Linux CF') + |
| - api.properties(revision='123456789abcdef') + |
| - api.properties(got_revision='123456789abcdef') + |
| - api.properties(buildnumber='42') + |
| - api.properties(slavename='TestSlave') |
| - ) |
| yield (api.test('builder_not_in_dispatch_directory') + |
| api.properties(mastername='chromium.fyi') + |
| api.properties(buildername='nonexistent_builder') + |