Convert the last 4 remaining bots on the LKGR waterfall to recipes

masters/master.chromium.lkgr/master_lkgr_cfg.py

Index: masters/master.chromium.lkgr/master_lkgr_cfg.py
diff --git a/masters/master.chromium.lkgr/master_lkgr_cfg.py b/masters/master.chromium.lkgr/master_lkgr_cfg.py
index 212ca67403297b1d2734690d0b1cc5e5870f4dd8..c28c7e05216ed05eea24cd5b6ac98033155cf83b 100644
--- a/masters/master.chromium.lkgr/master_lkgr_cfg.py
+++ b/masters/master.chromium.lkgr/master_lkgr_cfg.py
@@ -5,7 +5,6 @@
 from master import gitiles_poller
 from master import master_config
 from master.factory import annotator_factory
-from master.factory import chromium_factory

[Nico, 2016/06/09 16:39:39]

\o/

 
 import master_site_config
 
@@ -18,8 +17,6 @@ B = helper.Builder
 F = helper.Factory
 S = helper.Scheduler
 
-def linux(): return chromium_factory.ChromiumFactory('src/build', 'linux2')
-
 m_annotator = annotator_factory.AnnotatorFactory()
 
 defaults['category'] = '1lkgr'
@@ -87,80 +84,29 @@ F('linux_asan_rel_media', m_annotator.BaseFactory(recipe='chromium',
 B('ASAN Debug', 'linux_asan_dbg', 'compile', 'chromium_lkgr')
 F('linux_asan_dbg', m_annotator.BaseFactory(recipe='chromium'))
 
-asan_chromiumos_rel_gyp = ('asan=1 lsan=1 sanitizer_coverage=edge '
-                'v8_enable_verify_heap=1 enable_ipc_fuzzer=1 chromeos=1')
 B('ChromiumOS ASAN Release', 'linux_chromiumos_asan_rel', 'compile',
   'chromium_lkgr')
-F('linux_chromiumos_asan_rel', linux().ChromiumASANFactory(
-    compile_timeout=2400,  # We started seeing 29 minute links, bug 360158
-    clobber=True,
-    options=['--compiler=goma-clang', 'chromium_builder_asan'],
-    factory_properties={
-       'cf_archive_build': ActiveMaster.is_production_host,
-       'cf_archive_name': 'asan',
-       'cf_archive_subdir_suffix': 'chromeos',
-       'gs_bucket': 'gs://chromium-browser-asan',
-       'gs_acl': 'public-read',
-       'gclient_env': {'GYP_DEFINES': asan_chromiumos_rel_gyp},
-       'use_mb': True,
-    }))
-
-asan_ia32_v8_arm = ('asan=1 sanitizer_coverage=edge disable_nacl=1 '
-                    'v8_target_arch=arm host_arch=x86_64 target_arch=ia32 '
-                    'v8_enable_verify_heap=1 ')
-
-asan_ia32_v8_arm_rel = asan_ia32_v8_arm + 'enable_ipc_fuzzer=1 '
+F('linux_chromiumos_asan_rel', m_annotator.BaseFactory(recipe='chromium',
+    # We started seeing 29 minute links, bug 360158
+    timeout=2400))
 
 # The build process is described at
 # https://sites.google.com/a/chromium.org/dev/developers/testing/addresssanitizer#TOC-Building-with-v8_target_arch-arm
 B('ASan Debug (32-bit x86 with V8-ARM)',
   'linux_asan_dbg_ia32_v8_arm',
   'compile', 'chromium_lkgr')
-F('linux_asan_dbg_ia32_v8_arm', linux().ChromiumASANFactory(
-    clobber=True,
-    target='Debug',
-    options=['--compiler=goma-clang', 'chromium_builder_asan'],
-    factory_properties={
-       'cf_archive_build': ActiveMaster.is_production_host,
-       'cf_archive_subdir_suffix': 'v8-arm',
-       'cf_archive_name': 'asan-v8-arm',
-       'gs_bucket': 'gs://chromium-browser-asan',
-       'gs_acl': 'public-read',
-       'gclient_env': {'GYP_DEFINES': asan_ia32_v8_arm},
-       'use_mb': True,
-    }))
+F('linux_asan_dbg_ia32_v8_arm', m_annotator.BaseFactory(recipe='chromium'))
 
 B('ASan Release (32-bit x86 with V8-ARM)',
   'linux_asan_rel_ia32_v8_arm',
   'compile', 'chromium_lkgr')
-F('linux_asan_rel_ia32_v8_arm', linux().ChromiumASANFactory(
-    clobber=True,
-    options=['--compiler=goma-clang', 'chromium_builder_asan'],
-    factory_properties={
-       'cf_archive_build': ActiveMaster.is_production_host,
-       'cf_archive_subdir_suffix': 'v8-arm',
-       'cf_archive_name': 'asan-v8-arm',
-       'gs_bucket': 'gs://chromium-browser-asan',
-       'gs_acl': 'public-read',
-       'gclient_env': {'GYP_DEFINES': asan_ia32_v8_arm_rel},
-       'use_mb': True,
-    }))
-
-linux_media_gyp = (' proprietary_codecs=1 ffmpeg_branding=ChromeOS')
+F('linux_asan_rel_ia32_v8_arm', m_annotator.BaseFactory(recipe='chromium'))
+
 B('ASan Release Media (32-bit x86 with V8-ARM)',
   'linux_asan_rel_media_ia32_v8_arm',
   'compile', 'chromium_lkgr')
-F('linux_asan_rel_media_ia32_v8_arm', linux().ChromiumASANFactory(
-    clobber=True,
-    options=['--compiler=goma-clang', 'chromium_builder_asan'],
-    factory_properties={
-       'cf_archive_build': ActiveMaster.is_production_host,
-       'cf_archive_subdir_suffix': 'v8-arm',
-       'cf_archive_name': 'asan-v8-arm',
-       'gs_bucket': 'gs://chrome-test-builds/media',
-       'gclient_env': {'GYP_DEFINES': asan_ia32_v8_arm_rel + linux_media_gyp},
-       'use_mb': True,
-    }))
+F('linux_asan_rel_media_ia32_v8_arm',
+  m_annotator.BaseFactory(recipe='chromium'))
 
 # TSan bots.
 B('TSAN Release', 'linux_tsan_rel', 'compile', 'chromium_lkgr')