commit 3b98be78670713b84a3f2fb17a373f072f0079ba
author George Burgess IV <gbiv@google.com> Tue Sep 12 14:20:43 2023 -0600
committer Chromeos LUCI <chromeos-scoped@luci-project-accounts.iam.gserviceaccount.com> Thu Sep 14 01:37:15 2023 +0000
tree a1c9d7098373126184dcd00d1320b9ec658aba26
parent a66a69b1acca474e8eada8fee3054ce77a4c8f2e

config: remove BranchScheduleConfig

I originally wanted to just delete the orderfile bits of this, but this
entire function seems no longer used, so just remove it.

BUG=b:295184201
TEST=./run_tests

Change-Id: I8d07ccc8f58c8b4ec74083b4c306dafe45894cd5
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/chromite/+/4858634
Tested-by: George Burgess <gbiv@chromium.org>
Commit-Queue: George Burgess <gbiv@chromium.org>
Reviewed-by: Greg Edelston <gredelston@google.com>

scripts/gen_luci_scheduler.py

diff --git a/scripts/gen_luci_scheduler.py b/scripts/gen_luci_scheduler.py
index 397dc1d..23adf91 100644
--- a/scripts/gen_luci_scheduler.py
+++ b/scripts/gen_luci_scheduler.py
@@ -15,16 +15,12 @@
 Notes:
   Normal builds are scheduled based on the builder values for
   'schedule' and 'triggered_gitiles' in config/chromeos_config.py.
-
-  Branched builds are scheduled based on the function
-  chromeos_config.BranchScheduleConfig()
 """
 
 # pylint: enable=line-too-long
 
 import sys
 
-from chromite.config import chromeos_config
 from chromite.lib import commandline
 from chromite.lib import config_lib
 
@@ -170,12 +166,11 @@
     }
 
 
-def genLuciSchedulerConfig(site_config, branch_config):
+def genLuciSchedulerConfig(site_config):
     """Generate a luciSchedulerConfig as a string.
 
     Args:
         site_config: A config_lib.SiteConfig instance.
-        branch_config: A list of BuildConfig instances to schedule.
 
     Returns:
         The complete scheduler configuration contents as a string.
@@ -189,9 +184,7 @@
     jobs = []
 
     # Order the configs consistently.
-    configs = [
-        site_config[name] for name in sorted(site_config)
-    ] + branch_config
+    configs = [site_config[name] for name in sorted(site_config)]
 
     for config in configs:
         # Populate jobs.
@@ -249,11 +242,9 @@
     options.Freeze()
 
     site_config = config_lib.GetConfig()
-    branch_config = chromeos_config.BranchScheduleConfig()
-
     with (
         open(options.file_out, "w", encoding="utf-8")
         if options.file_out
         else sys.stdout
     ) as fh:
-        fh.write(genLuciSchedulerConfig(site_config, branch_config))
+        fh.write(genLuciSchedulerConfig(site_config))