CrOS: Switch tryserver over to recipes, Gitiles.

scripts/slave/recipes/cros/cbuildbot_tryjob.py

Index: scripts/slave/recipes/cros/cbuildbot_tryjob.py
diff --git a/scripts/slave/recipes/cros/cbuildbot_tryjob.py b/scripts/slave/recipes/cros/cbuildbot_tryjob.py
index dc7b7f85521d188723e7c58cbf2d8309ecfcc305..033f8336928eeee11cac373d274ec7ad48d565a5 100644
--- a/scripts/slave/recipes/cros/cbuildbot_tryjob.py
+++ b/scripts/slave/recipes/cros/cbuildbot_tryjob.py
@@ -13,9 +13,9 @@ DEPS = [
 # Map master name to 'chromite' configuration name.
 _MASTER_CONFIG_MAP = {
     'chromiumos.tryserver': {
-      'master_config': 'external',
+      'master_config': 'chromiumos_tryserver',
       'variants': {
-        'etc': ['chromeos_tryserver_etc'],
+        'etc': ['chromiumos_tryserver_etc'],
       },
     },
 }
@@ -38,7 +38,14 @@ _TRYJOB_DATA = """
 
 def RunSteps(api):
   # The 'cbuildbot' config name to build is the name of the builder.
-  cbb_config_name = api.properties.get('buildername')
+  #
+  # TODO(dnj): After we fully switch to BuildBucket scheduling, load the config
+  #            name from the BuildBucket job instead of `cbb_config` build
+  #            property. We can't do this yet b/c the job description can
+  #            specify multiple configs in one tryjob, so there's no way for us
+  #            to know which one we are.
+  cbb_config_name = api.properties.get('cbb_config')
+  assert cbb_config_name, "No configuration name specified."
 
   cbb = cros_chromite.Get()
   cbb_config = cbb.get(cbb_config_name)
@@ -49,14 +56,26 @@ def RunSteps(api):
       _MASTER_CONFIG_MAP)
   api.chromite.c.cbb.config = cbb_config_name
 
-  # Determine our build directory name.
-  namebase = cbb_config_name
-  if cbb_config:
-    namebase = 'internal' if cbb_config.get('internal') else 'external'
-  api.chromite.c.cbb.builddir = '%s_master' % (namebase,)
+  repository = api.properties.get('repository')
+  revision = api.properties.get('revision')
+  assert repository, "A repository must be specified."
+  assert revision, "A revision must be specified."
+  assert api.chromite.check_repository('tryjob', repository), (
+      "Refusing to query unknown tryjob repository: %s" % (repository,))
+
+  # Add parameters specified in the tryjob description.
+  tryjob_args = api.chromite.load_try_job(repository, revision)
+
+  # Determine our build directory name based on whether this build is internal
+  # or external.

[David James, 2015/09/15 19:35:51]

Can you add a TODO here to put this info in the tryjob request instead of
determining it here?

[dnj, 2015/09/15 21:55:52]

The build directory? I'm actually a bit reluctant to do this, as the number of
distinct build directories directly impacts the available disk space. If the
number is large or (in the case of accepting user criteria) unbounded.

AFAIK the only time we aren't explicitly using "internal_master",
"external_master", or "etc_master" is if the tryjob specifies a builder that
doesn't exist in the "master" Chromite checkout, so we quarantine it. This is
potentially possible if Chromite bootstraps to a branch that includes the
target, but not a typical use case.

[David James, 2015/09/15 22:02:54]

No, I'm just proposing putting internal/external in the request.

[dnj (Google), 2015/09/16 00:07:42]

Is internal/external not a property of the board config? AFAIK the only case
we're worried about is if the board config cannot be loaded by the recipe b/c
it's not in Chromite master.

Perhaps the better thing to do would be:
- If the config specifies internal/external, use that.
- Otherwise, root it in "etc_master" with clobber=True.

I can remove the "etc" builder special logic and have it follow the same code
path. WDYT?

[dnj (Google), 2015/09/16 00:41:40]

Done.

+  if not api.chromite.c.cbb.builddir:
+    namebase = cbb_config_name

[David James, 2015/09/15 19:35:51]

default should be 'etc', no?

Maybe add TODO to point out here that we're reusing checkouts across internal /
external here, which is somewhat bad, but this will be fixed by the above
suggestion.

[dnj, 2015/09/15 21:55:52]

The "etc" builder will use "etc_master" (see config.py).

[David James, 2015/09/15 22:02:54]

If cbb_config is "etc", the variable is poorly named. "etc" is the column name /
template.

cbb_config_name should be equal to "fakeboard_paladin" if we're running the
"fakeboard_paladin" bot in the "etc" column.

Can you fix the variable names everywhere to correspond to what's stored in
them?

[dnj (Google), 2015/09/16 00:07:42]

cbb_config is not "etc". It's the name of the actual config as specified by the
tryjob/build. The BUILDERNAME environment variable will be "etc", but I don't
look at that here.

+    if cbb_config:
+      namebase = 'internal' if cbb_config.get('internal') else 'external'
+    api.chromite.c.cbb.builddir = '%s_master' % (namebase,)
 
   # Run our 'cbuildbot'.
-  api.chromite.run_cbuildbot(tryjob=True)
+  api.chromite.run_cbuildbot(args=tryjob_args)
 
 
 def GenTests(api):
@@ -65,10 +84,11 @@ def GenTests(api):
       api.test('basic')
       + api.properties(
           mastername='chromiumos.tryserver',
-          buildername='x86-generic-full',
+          buildername='full',
           slavename='test',
           repository='https://chromium.googlesource.com/chromiumos/tryjobs.git',
           revision=api.gitiles.make_hash('test'),
+          cbb_config='x86-generic-full',
       )
       + api.step_data(
           'Fetch tryjob commit',
@@ -93,9 +113,10 @@ def GenTests(api):
           mastername='chromiumos.tryserver',
           buildername='etc',
           slavename='test',
-          cbb_variant='etc',
           repository='https://chromium.googlesource.com/chromiumos/tryjobs.git',
           revision=api.gitiles.make_hash('test'),
+          cbb_config='fakeboard-paladin',
+          cbb_variant='etc',
       )
       + api.step_data(
           'Fetch tryjob commit',
@@ -118,10 +139,11 @@ def GenTests(api):
       api.test('basic_no_files_in_commit')
       + api.properties(
           mastername='chromiumos.tryserver',
-          buildername='x86-generic-full',
+          buildername='full',
           slavename='test',
           repository='https://chromium.googlesource.com/chromiumos/tryjobs.git',
           revision=api.gitiles.make_hash('test'),
+          cbb_config='x86-generic-full',
       )
       + api.step_data(
           'Fetch tryjob commit',