From: Thibaut VARÈNE <hacks@slashdirt.org>
Date: Tue, 14 Nov 2023 13:23:50 +0000 (+0100)
Subject: phase1: treat all branches equally for building
X-Git-Tag: v10~15
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=b372bb5c19282e0eaa0b25f6717ed70afc2e74c5;p=buildbot.git

phase1: treat all branches equally for building

Following discussion here:
https://lists.openwrt.org/pipermail/openwrt-devel/2023-November/041769.html

Signed-off-by: Thibaut VARÈNE <hacks@slashdirt.org>
---

diff --git a/phase1/master.cfg b/phase1/master.cfg
index 9b749b4..2d6f304 100644
--- a/phase1/master.cfg
+++ b/phase1/master.cfg
@@ -249,7 +249,6 @@ def prioritizeBuilders(master, builders):
     i = 1
     for bname in branchNames:
         bldrNamePrio[bname] = i
-        i += 1
 
     def is_building(bldr):
         return bool(bldr.building) or bool(bldr.old_building)
@@ -270,7 +269,7 @@ def prioritizeBuilders(master, builders):
                 pos = prio + 50 - min(hiprio, 50)    # higher priority (larger positive number) raises position
                 break
 
-        # pos order: janitor/local (0), tag builds per branch order if any [1..50], !tag builds per branch order [51...]
+        # pos order: janitor/local (0), tag builds if any [1..50], !tag builds [51...]
 
         if not complete_at:
             date = datetime.min