summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHolger Levsen <holger@layer-acht.org>2015-06-12 20:08:56 +0200
committerHolger Levsen <holger@layer-acht.org>2015-06-12 20:08:56 +0200
commiteabbb7b382662b5af0bbf30ba2691662af6085b5 (patch)
tree57eaf35cb2738a0eb07dc43323883d29137e3662
parent53a741bacb867be5145363b263835201582a1208 (diff)
downloadjenkins.debian.net-eabbb7b382662b5af0bbf30ba2691662af6085b5.tar.xz
Revert "reproducible: scheduler: simplify the suite prioritaizing code"
This reverts commit b7198e0e12e5a3a89932f74752640c817cbdf923.
-rwxr-xr-xbin/reproducible_scheduler.py7
1 files changed, 6 insertions, 1 deletions
diff --git a/bin/reproducible_scheduler.py b/bin/reproducible_scheduler.py
index 463f7a6d..42ddbae4 100755
--- a/bin/reproducible_scheduler.py
+++ b/bin/reproducible_scheduler.py
@@ -307,7 +307,12 @@ def scheduler():
now_queued_here = {}
# make sure to schedule packages in unstable first
- for suite in sorted(SUITES, key=lambda x: x != 'unstable')
+ # (but keep the view ordering everywhere else)
+ priotized_suite_order = ['unstable']
+ for suite in SUITES:
+ if suite not in priotized_suite_order:
+ priotized_suite_order.append(suite)
+ for suite in priotized_suite_order:
query = 'SELECT count(*) ' + \
'FROM schedule AS p JOIN sources AS s ON p.package_id=s.id ' + \
'WHERE s.suite="{suite}"'.format(suite=suite)