From 0831684fba450ec59da9a812ee619a0d34100c40 Mon Sep 17 00:00:00 2001 From: Erich Eckner Date: Mon, 15 Apr 2019 09:41:00 +0200 Subject: bin/get-assignment: do and remove TODOs --- bin/get-assignment | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'bin/get-assignment') diff --git a/bin/get-assignment b/bin/get-assignment index 1c6f3b8..14a5c61 100755 --- a/bin/get-assignment +++ b/bin/get-assignment @@ -222,9 +222,7 @@ next_building=$( mysql_join_binary_packages_binary_packages_in_repositories printf ' JOIN `architecture_compatibilities`' printf ' ON `architecture_compatibilities`.`built_for`=`build_assignments`.`architecture`' - # TODO: this should become build_slave_compatible, once /all/ build slaves can handle - # forced build assignment architectures - printf ' AND `architecture_compatibilities`.`fully_compatible`' + printf ' AND `architecture_compatibilities`.`build_slave_compatible`' printf ' JOIN `architectures`' printf ' ON `architecture_compatibilities`.`runs_on`=`architectures`.`id`' printf ' LEFT' @@ -482,9 +480,15 @@ count_pending=$( mysql_join_build_assignments_binary_packages mysql_join_binary_packages_binary_packages_in_repositories mysql_join_binary_packages_in_repositories_repositories + printf ' JOIN `architecture_compatibilities`' + printf ' ON `architecture_compatibilities`.`built_for`=`build_assignments`.`id`' + printf ' AND `architecture_compatibilities`.`build_slave_compatible`' + printf ' JOIN `architectures`' + printf ' ON `architecture_compatibilities`.`runs_on`=`architectures`.`id`' printf ' WHERE `repositories`.`name`="build-list"' printf ' AND `build_assignments`.`is_blocked` IS NULL' -# TODO: there should be some architecture check here, too + printf ' AND `architectures`.`name`=from_base64("%s")' \ + "${arch}" printf ';\n' } | \ mysql_run_query -- cgit v1.2.3