From c13bcbe42ab5b6f020b098f10cdbf8dac76afae4 Mon Sep 17 00:00:00 2001 From: Erich Eckner Date: Thu, 22 Mar 2018 14:39:11 +0100 Subject: bin/build-master-status-from-mysql: do not look for locked testing and tested packages (all the information in package-states) --- bin/build-master-status-from-mysql | 102 ------------------------------------- 1 file changed, 102 deletions(-) (limited to 'bin/build-master-status-from-mysql') diff --git a/bin/build-master-status-from-mysql b/bin/build-master-status-from-mysql index 0e66473..081baec 100755 --- a/bin/build-master-status-from-mysql +++ b/bin/build-master-status-from-mysql @@ -37,28 +37,6 @@ mysql_cleanup sort "${work_dir}/build-list" > \ "${tmp_dir}/build-list.file" -# shellcheck disable=SC2016 -{ - printf 'SELECT DISTINCT ' - printf '`package_sources`.`%s`,' \ - 'pkgbase' 'git_revision' 'mod_git_revision' - printf '`upstream_repositories`.`name`' - printf ' FROM `build_slaves`' - mysql_join_build_slaves_build_assignments - mysql_join_build_assignments_package_sources - mysql_join_package_sources_upstream_repositories -} | \ - mysql_run_query | \ - tr '\t' ' ' | \ - sort > \ - "${tmp_dir}/locked.mysql" -find "${work_dir}/package-states" -mindepth 1 -maxdepth 1 -name '*.locked' -printf '%f\n' | \ - sed ' - s/\.\([^.]\+\)\.\([^.]\+\)\.\([^.]\+\)\.[^.]\+$/ \1 \2 \3/ - ' | \ - sort > \ - "${tmp_dir}/locked.file" - # shellcheck disable=SC2016 { printf 'SELECT DISTINCT `package_sources`.`pkgbase`' @@ -75,79 +53,7 @@ find "${work_dir}/package-states" -mindepth 1 -maxdepth 1 -name '*.locked' -prin sort "${work_dir}/deletion-list" > \ "${tmp_dir}/deletion-list.file" -# shellcheck disable=SC2016 { - printf 'SELECT ' - printf '`binary_packages`.`%s`,' \ - 'pkgname' \ - 'epoch' \ - 'pkgver' \ - 'pkgrel' \ - 'sub_pkgrel' - printf '`architectures`.`name`' - printf ' FROM `binary_packages`' - mysql_join_binary_packages_repositories - mysql_join_binary_packages_architectures - mysql_join_repositories_repository_stabilities - printf ' WHERE `binary_packages`.`is_tested`' - printf ' AND NOT `binary_packages`.`has_issues`' - printf ' AND `repository_stabilities`.`name`="testing"' -} | \ - mysql_run_query | \ - sed ' - s/^\(\S\+\)\s\(\S\+\)\s\(\S\+\)\s\(\S\+\)\s\(\S\+\)\s\(\S\+\)$/\1-\2:\3-\4.\5-\6.pkg.tar.xz/ - ' | \ - sort -u > \ - "${tmp_dir}/tested.mysql" -find "${work_dir}/package-states" -mindepth 1 -maxdepth 1 \ - -name '*.tested' \ - -exec cat '{}' \; | \ - sed ' - s/-\([^-.]\+\)\(-[^-]\+\)$/-\1.0\2/ - s/-\([^-:]\+\)\(\(-[^-]\+\)\{2\}\)$/-0:\1\2/ - ' | \ - sort -u > \ - "${tmp_dir}/tested.file" - -# shellcheck disable=SC2016 -{ - printf 'SELECT ' - printf '`binary_packages`.`%s`,' \ - 'pkgname' \ - 'epoch' \ - 'pkgver' \ - 'pkgrel' \ - 'sub_pkgrel' - printf '`architectures`.`name`' - printf ' FROM `binary_packages`' - mysql_join_binary_packages_repositories - mysql_join_binary_packages_architectures - mysql_join_repositories_repository_stabilities - printf ' WHERE NOT `binary_packages`.`is_tested`' - printf ' AND NOT `binary_packages`.`has_issues`' - printf ' AND `repository_stabilities`.`name`="testing"' -} | \ - mysql_run_query | \ - sed ' - s/^\(\S\+\)\s\(\S\+\)\s\(\S\+\)\s\(\S\+\)\s\(\S\+\)\s\(\S\+\)$/\1-\2:\3-\4.\5-\6.pkg.tar.xz/ - ' | \ - sort -u > \ - "${tmp_dir}/testing.mysql" -find "${work_dir}/package-states" -mindepth 1 -maxdepth 1 \ - -name '*.testing' \ - -exec cat '{}' \; | \ - sed ' - s/-\([^-.]\+\)\(-[^-]\+\)$/-\1.0\2/ - s/-\([^-:]\+\)\(\(-[^-]\+\)\{2\}\)$/-0:\1\2/ - ' | \ - sort -u > \ - "${tmp_dir}/testing.file" - -{ - diff -u \ - "${tmp_dir}/locked.file" \ - "${tmp_dir}/locked.mysql" || \ - true mysql_sanity_check || true diff -u \ "${tmp_dir}/build-list.file" \ @@ -157,14 +63,6 @@ find "${work_dir}/package-states" -mindepth 1 -maxdepth 1 \ "${tmp_dir}/deletion-list.file" \ "${tmp_dir}/deletion-list.mysql" || \ true - diff -u \ - "${tmp_dir}/tested.file" \ - "${tmp_dir}/tested.mysql" || \ - true - diff -u \ - "${tmp_dir}/testing.file" \ - "${tmp_dir}/testing.mysql" || \ - true } | \ sed ' s,^-.*$,\0, -- cgit v1.2.3-70-g09d2