summaryrefslogtreecommitdiff
path: root/bin
diff options
context:
space:
mode:
authorErich Eckner <git@eckner.net>2019-04-14 19:35:42 +0200
committerErich Eckner <git@eckner.net>2019-04-14 19:35:42 +0200
commitb408d8fb7c4692be53590175ce5eb05f4e12a362 (patch)
tree157a20a5d7463071557f97d4f9b36dc184ef7255 /bin
parent966cfe56c427627aa4ccfe88ea6c74efd6c66e02 (diff)
downloadbuilder-b408d8fb7c4692be53590175ce5eb05f4e12a362.tar.xz
bin/get-assignment: hand out /any/ compatible architecture
Diffstat (limited to 'bin')
-rwxr-xr-xbin/get-assignment10
1 files changed, 7 insertions, 3 deletions
diff --git a/bin/get-assignment b/bin/get-assignment
index abb4c96..5749f23 100755
--- a/bin/get-assignment
+++ b/bin/get-assignment
@@ -131,6 +131,7 @@ currently_building=$(
printf ' ON `architecture_compatibilities`.`built_for`=`build_assignments`.`architecture`'
printf ' JOIN `architectures`'
printf ' ON `architecture_compatibilities`.`runs_on`=`architectures`.`id`'
+ printf ' AND `architecture_compatibilities`.`build_slave_compatible`'
printf ' WHERE `build_slaves`.`id`=from_base64("%s")' \
"$(printf '%s' "${slave_id}" | base64 -w0)"
printf ' AND `binary_packages_in_repositories`.`repository`=%s' \
@@ -218,7 +219,7 @@ next_building=$(
mysql_join_binary_packages_binary_packages_in_repositories
printf ' JOIN `architecture_compatibilities`'
printf ' ON `architecture_compatibilities`.`built_for`=`build_assignments`.`architecture`'
- 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'
@@ -319,8 +320,11 @@ next_building=$(
printf ' FROM `binary_packages_in_repositories`'
mysql_join_binary_packages_in_repositories_repositories
printf ' AND `repositories`.`is_on_master_mirror`'
- mysql_join_repositories_architectures
-# TODO: this seems wrong - an "any" package will never match here!
+ printf ' JOIN `architecture_compatibilities`'
+ printf ' ON `repositories`.`architecture`=`architecture_compatibilities`.`runs_on`'
+ printf ' AND `architecture_compatibilities`.`build_slave_compatible`'
+ printf ' JOIN `architectures`'
+ printf ' ON `architectures`.`id`=`architecture_compatibilities`.`built_for`'
printf ' AND `architectures`.`name`=from_base64("%s")' \
"${arch}"
mysql_join_binary_packages_in_repositories_binary_packages