Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(691)

Unified Diff: masters/master.chromiumos.tryserver/chromiumos_tryserver_util.py

Issue 1344673003: CrOS: Switch tryserver over to recipes, Gitiles. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/tools/build
Patch Set: Clean up comments. Created 5 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | masters/master.chromiumos.tryserver/config.current.txt » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: masters/master.chromiumos.tryserver/chromiumos_tryserver_util.py
diff --git a/masters/master.chromiumos.tryserver/chromiumos_tryserver_util.py b/masters/master.chromiumos.tryserver/chromiumos_tryserver_util.py
index 19b8598156e767e06deecc138ac8db4d965c7633..4ecf1ba49f086e0ee8f0e45c150930941d32a7eb 100644
--- a/masters/master.chromiumos.tryserver/chromiumos_tryserver_util.py
+++ b/masters/master.chromiumos.tryserver/chromiumos_tryserver_util.py
@@ -152,15 +152,15 @@ class NextSlaveAndBuild(object):
"""
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
@@ -217,10 +217,10 @@ class NextSlaveAndBuild(object):
-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():
« no previous file with comments | « no previous file | masters/master.chromiumos.tryserver/config.current.txt » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698