lkgr master: Port linux ubsan bots to recipes

masters/master.chromium.lkgr/master_lkgr_cfg.py

 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 from master import gitiles_poller
 from master import master_config
 from master.factory import annotator_factory
 from master.factory import chromium_factory
 
 import master_site_config
@@ skipping 359 matching lines @@
        'gs_acl': 'public-read',
        'gclient_env': {'GYP_DEFINES': msan_gyp + 'msan_track_origins=2 '},
        'use_mb': True,
     }))
 
 # This is a bot that uploads LKGR telemetry harnesses to Google Storage.
 B('Telemetry Harness Upload', 'telemetry_harness_upload', None, 'chromium_lkgr')
 F('telemetry_harness_upload',
   m_annotator.BaseFactory('perf/telemetry_harness_upload'))
 
-# The build process for UBSan vptr is described at
-# http://dev.chromium.org/developers/testing/undefinedbehaviorsanitizer
-ubsan_gyp = ('ubsan=1 ')
 
 B('UBSan Release', 'linux_ubsan_rel', 'compile', 'chromium_lkgr')
-F('linux_ubsan_rel', linux().ChromiumFactory(
-    clobber=True,
-    compile_timeout=5400, # UBSan builds very slowly with edge level coverage
-    target='Release',
-    options=['--compiler=goma-clang', 'chromium_builder_asan'],
-    factory_properties={
-       'cf_archive_build': ActiveMaster.is_production_host,
-       'cf_archive_name': 'ubsan',
-       'gs_bucket': 'gs://chromium-browser-ubsan',
-       'gs_acl': 'public-read',
-       'gclient_env': {'GYP_DEFINES': ubsan_gyp},
-       'use_mb': True,
-    }))
-
-ubsan_vptr_gyp = ('ubsan_vptr=1 sanitizer_coverage=edge ')
+# UBSan builds very slowly with edge level coverage
+F('linux_ubsan_rel', m_annotator.BaseFactory(recipe='chromium', timeout=5400))
 
 B('UBSan vptr Release', 'linux_ubsan_vptr_rel', 'compile', 'chromium_lkgr')
-F('linux_ubsan_vptr_rel', linux().ChromiumFactory(
-    clobber=True,
-    target='Release',
-    options=['--compiler=goma-clang', 'chromium_builder_asan'],
-    factory_properties={
-       'cf_archive_build': ActiveMaster.is_production_host,
-       'cf_archive_subdir_suffix': 'vptr',
-       'cf_archive_name': 'ubsan-vptr',
-       'gs_bucket': 'gs://chromium-browser-ubsan',
-       'gs_acl': 'public-read',
-       'gclient_env': {'GYP_DEFINES': ubsan_vptr_gyp},
-       'use_mb': True,
-    }))
+F('linux_ubsan_vptr_rel', m_annotator.BaseFactory(recipe='chromium'))
 
 def Update(_config, active_master, c):
   lkgr_poller = gitiles_poller.GitilesPoller(
       'https://chromium.googlesource.com/chromium/src',
       branches=['lkgr'])
   c['change_source'].append(lkgr_poller)
   return helper.Update(c)