gen_luci_scheduler: Correctly handle triggers for branched builds.
There was a problem generating triggers for build jobs of branched
configs, fix it!
BUG=None
TEST=run_tests
Change-Id: I84e71f4c58420664e2b7acde00d4d56cbc17ae55
Reviewed-on: https://chromium-review.googlesource.com/1308734
Commit-Ready: Don Garrett <dgarrett@chromium.org>
Tested-by: Don Garrett <dgarrett@chromium.org>
Reviewed-by: Alec Thilenius <athilenius@google.com>
Reviewed-by: Bernie Thompson <bhthompson@chromium.org>
diff --git a/scripts/gen_luci_scheduler_unittest.py b/scripts/gen_luci_scheduler_unittest.py
index 181cb15..5a2457f 100644
--- a/scripts/gen_luci_scheduler_unittest.py
+++ b/scripts/gen_luci_scheduler_unittest.py
@@ -259,9 +259,19 @@
schedule='run daily',
schedule_branch='test-branch',
),
+ default_config.derive(
+ name='branch_tester_triggered',
+ luci_builder='TestBuilder',
+ display_label='TestLabel',
+ schedule='run daily',
+ schedule_branch='test-branch',
+ triggered_gitiles=[[
+ 'gitiles_url_a',
+ ['ref_a', 'ref_b'],
+ ]],
+ ),
]
-
expected = '''# Defines buckets on luci-scheduler.appspot.com.
#
# For schema of this file and documentation see ProjectConfig message in
@@ -298,6 +308,7 @@
refs: "ref_b"
}
triggers: "build_triggered_a"
+ triggers: "test-branch-branch_tester_triggered"
}
trigger {
@@ -401,6 +412,24 @@
properties: "cbb_extra_args:[\\"--buildbot\\"]"
}
}
+
+job {
+ id: "test-branch-branch_tester_triggered"
+ acl_sets: "default"
+ schedule: "run daily"
+ buildbucket: {
+ server: "cr-buildbucket.appspot.com"
+ bucket: "luci.chromeos.general"
+ builder: "TestBuilder"
+ tags: "cbb_branch:test-branch"
+ tags: "cbb_config:branch_tester_triggered"
+ tags: "cbb_display_label:TestLabel"
+ properties: "cbb_branch:test-branch"
+ properties: "cbb_config:branch_tester_triggered"
+ properties: "cbb_display_label:TestLabel"
+ properties: "cbb_extra_args:[\\"--buildbot\\"]"
+ }
+}
'''
result = gen_luci_scheduler.genLuciSchedulerConfig(
site_config, branch_configs)