summaryrefslogtreecommitdiff
path: root/bin/get-assignment
diff options
context:
space:
mode:
authorErich Eckner <git@eckner.net>2019-04-15 09:41:00 +0200
committerErich Eckner <git@eckner.net>2019-04-15 09:41:00 +0200
commit0831684fba450ec59da9a812ee619a0d34100c40 (patch)
tree5516a3442bc1730e067f22ed6e2f392d090c0e9c /bin/get-assignment
parent3ffd6cec804ce0ee428f04ebda6efa8b4b963848 (diff)
downloadbuilder-0831684fba450ec59da9a812ee619a0d34100c40.tar.xz
bin/get-assignment: do and remove TODOs
Diffstat (limited to 'bin/get-assignment')
-rwxr-xr-xbin/get-assignment12
1 files changed, 8 insertions, 4 deletions
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