commit 73148e5035d19d09b4ade4fc32fbd35c85203ff0
author Don Garrett <dgarrett@google.com> Fri Aug 17 16:54:46 2018 -0700
committer Don Garrett <dgarrett@chromium.org> Mon Sep 17 14:19:08 2018 +0000
tree 3684ff815c9c8f9c252b45d9d6ed47ba34d82078
parent a7bfb0f9e7d5abf22d800e202578399e0e2dbf59

luci_scheduler: Add support for cbb_workspace_branch.

Add support for a new optional build config value "workspace_branch"
that should populate the tag/property cbb_workspace_branch.

This requires adding support for optional tags/properties to
gen_luci_scheduler. The implementation of this has the side effect of
sorting the generated tags/properties, which is reflected in the
unittests.

BUG=chromium:875509
TEST=run_tests

Change-Id: If9f1706bc9e2e1534088722ea9f59fc7f627494d
Reviewed-on: https://chromium-review.googlesource.com/1180509
Reviewed-by: Don Garrett <dgarrett@chromium.org>
Tested-by: Don Garrett <dgarrett@chromium.org>
Commit-Queue: Don Garrett <dgarrett@chromium.org>

scripts/gen_luci_scheduler.py

diff --git a/scripts/gen_luci_scheduler.py b/scripts/gen_luci_scheduler.py
index b3e9876..b685111 100644
--- a/scripts/gen_luci_scheduler.py
+++ b/scripts/gen_luci_scheduler.py
@@ -63,6 +63,29 @@
   Returns:
     Multiline string to include in the luci scheduler configuration.
   """
+  if 'schedule_branch' in build_config:
+    branch = build_config.schedule_branch
+    job_name = '%s-%s' % (branch, build_config.name)
+  else:
+    branch = 'master'
+    job_name = build_config.name
+
+  tags = {
+      'cbb_branch': branch,
+      'cbb_config': build_config.name,
+      'cbb_display_label': build_config.display_label,
+      'cbb_workspace_branch': build_config.workspace_branch,
+  }
+
+  # Filter out tags with no value set.
+  tags = {k: v for k, v in tags.iteritems() if v}
+
+
+  tag_lines = ['    tags: "%s:%s"' % (k, tags[k])
+               for k in sorted(tags.keys())]
+  prop_lines = ['    properties: "%s:%s"' % (k, tags[k])
+                for k in sorted(tags.keys())]
+
   # TODO: Move --buildbot arg into recipe, and remove from here.
   template = """
 job {
@@ -73,30 +96,19 @@
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.chromeos.general"
     builder: "%(builder)s"
-    tags: "cbb_branch:%(branch)s"
-    tags: "cbb_display_label:%(display_label)s"
-    tags: "cbb_config:%(name)s"
-    properties: "cbb_branch:%(branch)s"
-    properties: "cbb_display_label:%(display_label)s"
-    properties: "cbb_config:%(name)s"
+%(tag_lines)s
+%(prop_lines)s
     properties: "cbb_extra_args:[\\"--buildbot\\"]"
   }
 }
 """
-  if 'schedule_branch' in build_config:
-    branch = build_config.schedule_branch
-    job_name = '%s-%s' % (branch, build_config.name)
-  else:
-    branch = 'master'
-    job_name = build_config.name
 
   return template % {
       'job_name': job_name,
-      'name': build_config.name,
       'builder': build_config.luci_builder,
-      'branch': branch,
-      'display_label': build_config.display_label,
       'schedule': build_config.schedule,
+      'tag_lines': '\n'.join(tag_lines),
+      'prop_lines': '\n'.join(prop_lines),
   }