summaryrefslogtreecommitdiffstats
path: root/bin
diff options
context:
space:
mode:
authorHolger Levsen <holger@layer-acht.org>2015-09-19 15:51:29 +0200
committerHolger Levsen <holger@layer-acht.org>2015-09-19 15:51:29 +0200
commit793ab5c97d242baa3f28fb71def002c21d8b78e7 (patch)
treec91b674a3abdff84704f9dc78f6c6b1c3fc976c3 /bin
parenta75935dfaf768ab9c7ec9515462d42414bad67c6 (diff)
downloadjenkins.debian.net-793ab5c97d242baa3f28fb71def002c21d8b78e7.tar.xz
reproducible: include arch in print_schedule_result()
Diffstat (limited to 'bin')
-rwxr-xr-xbin/reproducible_scheduler.py18
1 files changed, 9 insertions, 9 deletions
diff --git a/bin/reproducible_scheduler.py b/bin/reproducible_scheduler.py
index b0f58973..973ef7b3 100755
--- a/bin/reproducible_scheduler.py
+++ b/bin/reproducible_scheduler.py
@@ -272,16 +272,16 @@ def update_sources_db(suite, arch, sources):
gen_packages_html([Package(x) for x in pkgs_to_add], no_clean=True)
-def print_schedule_result(suite, criteria, packages):
+def print_schedule_result(suite, arch, criteria, packages):
'''
`packages` is the usual list-of-tuples returned by SQL queries,
where the first item is the id and the second one the package name
'''
log.info('--------------------------------------------------------------')
- log.info('Criteria: ' + criteria)
- log.info('Suite: ' + suite)
- log.info('Amount: ' + str(len(packages)))
- log.info('Packages: ' + ' '.join([x[1] for x in packages]))
+ log.info('Criteria: ' + criteria)
+ log.info('Suite/Arch: ' + suite + '/' arch)
+ log.info('Amount: ' + str(len(packages)))
+ log.info('Packages: ' + ' '.join([x[1] for x in packages]))
def queue_packages(all_pkgs, packages, date):
@@ -326,7 +326,7 @@ def query_untested_packages(suite, arch, limit):
ORDER BY random()
LIMIT {limit}""".format(suite=suite, arch=arch, limit=limit)
packages = query_db(query)
- print_schedule_result(suite, criteria, packages)
+ print_schedule_result(suite, arch, criteria, packages)
return packages
@@ -344,7 +344,7 @@ def query_new_versions(suite, arch, limit):
pkgs = query_db(query)
# this is to avoid constant rescheduling of packages in our exp repository
packages = [(x[0], x[1]) for x in pkgs if version_compare(x[2], x[3]) > 0]
- print_schedule_result(suite, criteria, packages)
+ print_schedule_result(suite, arch, criteria, packages)
return packages
@@ -362,7 +362,7 @@ def query_old_ftbfs_versions(suite, arch, limit):
ORDER BY r.build_date
LIMIT {limit}""".format(suite=suite, arch=arch, limit=limit)
packages = query_db(query)
- print_schedule_result(suite, criteria, packages)
+ print_schedule_result(suite, arch, criteria, packages)
return packages
@@ -378,7 +378,7 @@ def query_old_versions(suite, arch, limit):
ORDER BY r.build_date
LIMIT {limit}""".format(suite=suite, arch=arch, minimum_age=MINIMUM_AGE[arch], limit=limit)
packages = query_db(query)
- print_schedule_result(suite, criteria, packages)
+ print_schedule_result(suite, arch, criteria, packages)
return packages