CrOS: Switch tryserver over to recipes, Gitiles.

masters/master.chromiumos.tryserver/chromiumos_tryserver_util.py

 # -*- python -*-
 # ex: set syntax=python:
 
 # Copyright 2014 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 urllib
 
 from common import cros_chromite
@@ skipping 134 matching lines @@
     return builders
 
   def is_testing_slave(self, slave):
     """Returns: True if 'slave' is a testing slave.
 
     Args:
       slave (BuildSlave): The build slave to test.
     """
     return self.testing_slave_pool.is_testing_slave(slave.slavename)
 
-  def FilterSlaves(self, chromeos_config, slaves):
-    """Filters |slaves| to only contain valid slaves for |chromeos_config|.
+  def FilterSlaves(self, cbb_config, slaves):
+    """Filters |slaves| to only contain valid slaves for |cbb_config|.
 
     Args:
-      chromeos_config (ChromiteTarget): The config to filter for.
+      cbb_config (ChromiteTarget): The config to filter for.
       slaves: List of BuildSlave objects to filter to filter.
     """
-    if (not chromeos_config or chromeos_config.HasVmTests() or
-        chromeos_config.HasHwTests()):
+    if (not cbb_config or cbb_config.HasVmTests() or
+        cbb_config.HasHwTests()):
       slaves = [s for s in slaves if not builder_config.IsGCESlave(s.getName())]
     return slaves
 
   def __call__(self, slaves, buildrequests):
     """Called by master to determine which job to run and which slave to use.
 
     Build requests may have a 'slaves_request' property (list of strings),
     established from the try job definition. Such requests allow try jobs to
     request to be run on specific slaves.
 
@@ skipping 36 matching lines @@
     # attached builders with the intention of using more-specialized (fewer
     # attached builders) slaves before using generic ones.
     normal_slaves = [s for s in slaves
                      if not self.is_testing_slave(s.slave)]
 
     for br in remaining:
       normal_slaves.sort(key=lambda s:
           -int(builder_config.IsGCESlave(s.slave.slavename)))
 
       # Iterate through slaves and choose the appropriate one.
-      chromeos_config_name = br.properties.getProperty('chromeos_config', None)
-      chromeos_config = configs.get(chromeos_config_name)
+      cbb_config_name = br.properties.getProperty('cbb_config', None)
+      cbb_config = configs.get(cbb_config_name)
       builder = br.master.status.getBuilder(br.buildername)
-      slaves = self.FilterSlaves(chromeos_config, builder.getSlaves())
+      slaves = self.FilterSlaves(cbb_config, builder.getSlaves())
       for s in normal_slaves:
         for builder_slave in slaves:
           if s.slave.slavename == builder_slave.getName():
             return s, br
     return None, None