CrOS: Switch tryserver over to recipes, Gitiles.

masters/master.chromiumos.tryserver/master.cfg

 # -*- python -*-
 # ex: set syntax=python:
 
 # 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.
 
 import os
 import random
 import shutil
 import subprocess
 import sys
 import tempfile
 
 # These modules come from scripts/master, which must be in the PYTHONPATH.
 from common import cros_chromite
+from master import gitiles_poller
 from master import master_utils
 from master import slaves_list
 from master.cros_try_job_git import CrOSTryJobGit
-from master.factory import chromeos_factory
+from master.factory import annotator_factory, chromeos_factory
 
 from buildbot.buildslave import BuildSlave
-from buildbot.changes.gitpoller import GitPoller
 from buildbot.process.properties import WithProperties
 
 # These modules come from scripts/common, which must be in the PYTHONPATH.
 import chromiumos_tryserver_util
 import config
 import master_site_config
 
 ActiveMaster = master_site_config.ChromiumOSTryServer
 
 # This is the dictionary that the buildmaster pays attention to. We also use
 # a shorter alias to save typing.
 c = BuildmasterConfig = {}
 
 config.DatabaseSetup(c, require_dbconfig=ActiveMaster.is_production_host)
 
 ####### CHANGESOURCES
 
-# The gitpoller doesn't play well with SSH-AGENT, so for test masters running
-# on a developer's machine, you need to set up a password-less ssh key.
 c['change_source'] = []
-c['change_source'].append(GitPoller(
-    repourl=ActiveMaster.repo_url_ext,
-    branch='master' if ActiveMaster.is_production_host else 'test',
-    workdir=tempfile.mkdtemp(prefix='gitpoller_ext'),
-    pollinterval=10))
+c['change_source'].append(gitiles_poller.GitilesPoller(
+    ActiveMaster.repo_url_ext,
+    branches=['master'],
+    ))
+gitiles_comparator = c['change_source'][-1].comparator
 
 if ActiveMaster.repo_url_int:
-  c['change_source'].append(GitPoller(
-      repourl=ActiveMaster.repo_url_int,
-      branch='master' if ActiveMaster.is_production_host else 'test',
-      workdir=tempfile.mkdtemp(prefix='gitpoller_int'),
-      pollinterval=10))
+  c['change_source'].append(gitiles_poller.GitilesPoller(
+      ActiveMaster.repo_url_int,
+      branches=['master'],
+      comparator=gitiles_comparator,
+      ))
 
 # Avoid merging requests.
 c['mergeRequests'] = lambda *_: False
 
 
 ####### JOB AND BUILDER SELECTION ALGORITHM
 
 DEFINED_SLAVES = slaves_list.SlavesList('slaves.cfg', 'ChromiumOSTryServer')
 
 # We isolate testing slaves here - we can force their use through the try job.
 testing_slave_pool = chromiumos_tryserver_util.TestingSlavePool(
     [slave['hostname']
      for slave in DEFINED_SLAVES.GetSlaves()
      if slave['version'] == 'testing'])
 
 ####### BUILDERS
 
 c['builders'] = []
 
 # ----------------------------------------------------------------------------
 # BUILDER DEFINITIONS
 
 nextSlaveAndBuild = chromiumos_tryserver_util.NextSlaveAndBuild(
     testing_slave_pool=testing_slave_pool)
 
+# Annotator factory object.
+factory_obj = annotator_factory.AnnotatorFactory(
+    active_master=ActiveMaster)
+
 # The 'builders' list defines the Builders. Each one is configured with a
 # dictionary, using the following keys:
 #  name (required): the name used to describe this bilder
 #  category (required): it is not used in the normal 'buildbot' meaning. It is
 #                       used by gatekeeper to determine which steps it should
 #                       look for to close the tree.
-def _GetCBuildbotBuilder(name, category, params=None, clobber=False):
-
-  factory = chromeos_factory.CbuildbotFactory(
-      params=params,
-      trybot=True,
-      clobber=clobber).get_factory()
-
-  return {
+def _GetCBuildbotBuilder(name, category, variant=None):
+  builder = {
+      'name': name,
       'builddir': name.replace(' ', '-'),
       'category': category,
-      'factory': factory,
-      'name': name,
+      'factory': chromeos_factory.ChromiteRecipeFactory(
+          factory_obj, 'cros/cbuildbot_tryjob'),
       'slavenames': DEFINED_SLAVES.GetSlavesName(builder=name),
       'nextSlaveAndBuild' : nextSlaveAndBuild,
+      'properties': {},
   }
-
+  if variant:
+    builder['properties']['cbb_variant'] = variant
+  return builder
 
 def _GetCategory(cfg):
   if cfg in ('etc',):
     return '1etc full|info'
   elif cfg in chromiumos_tryserver_util.precq_builders:
     return '2precq full|info'
   elif cfg in chromiumos_tryserver_util.cbb_builders:
     return '3general full|info'
   else:
     raise TypeError("Unhandled builder type: %s" % (type(cfg).__name__))
 
 
 def _GetBuilder(cfg):
   builder = _GetCBuildbotBuilder(
       cfg,
       _GetCategory(cfg),
-      params=WithProperties('%(chromeos_config:-)s'),
   )
   return builder
 
 
 def _GetEtcBuilder():
   name = 'etc'
   cbuilddir = 'etc_%(branch)s' % {
       'branch': 'master',
   }
 
   builder = _GetCBuildbotBuilder(
       name,
       _GetCategory(name),
-      params=WithProperties('%(chromeos_config:-)s'),
-      clobber=True,
+      variant='etc',
   )
   return builder
 
 
 # Add 'etc' builder to try arbitrary configs.
 c['builders'] += [_GetEtcBuilder()]
 
 # Add Try builders for every current 'cbuildbot' config.
 c['builders'] += [_GetBuilder(cfg)
                   for cfg in sorted(chromiumos_tryserver_util.cbb_builders)]
@@ skipping 56 matching lines @@
     builders=[],
     relayhost=config.Master.smtp,
     lookup=master_utils.UsersAreEmails()))
 
 # Try job result emails.
 from master.try_mail_notifier import TryMailNotifier
 
 def _GetInfo(info, build):
   """Get the subject of a trybot email."""
   info = info.copy()
-  info['chromeos_config'] = build.getProperties().getProperty('chromeos_config',
-                                                              info['builder'])
+  info['cbb_config'] = build.getProperties().getProperty('cbb_config',
+                                                         info['builder'])
   return info
 
 c['status'].append(TryMailNotifier(
     reply_to=ActiveMaster.reply_to,
     failure_message='TRY FAILED',
     footer=email_footer,
     fromaddr=ActiveMaster.from_address,
-    subject="try %(result)s for %(reason)s on %(chromeos_config)s",
+    subject="try %(result)s for %(reason)s on %(cbb_config)s",
     mode='all',
     get_info=_GetInfo,
     relayhost=smtp_host,
     lookup=master_utils.UsersAreEmails()))
 
 # Do it at the end to override values set by AutoSetupMaster, the default is
 # too low. Must keep at least a few days worth of builds.
 c['buildHorizon'] = 3000
 c['logHorizon'] = 3000
 # Must be at least 2x the number of slaves.
 c['eventHorizon'] = 200
 
 if not ActiveMaster.is_production_host:
   # Dump the current configuration.
   master_utils.DumpSetup(c)