diff options
| -rwxr-xr-x | bin/common-functions | 12 | ||||
| -rwxr-xr-x | conf/default.conf | 7 |
2 files changed, 13 insertions, 6 deletions
diff --git a/bin/common-functions b/bin/common-functions index 1dcd328..8df8470 100755 --- a/bin/common-functions +++ b/bin/common-functions @@ -1137,8 +1137,8 @@ print_list_of_archaic_packages() { for source in "$@"; do case "${source}" in 'testing') - # packages remaining longer than 7 days in testing - find "${work_dir}/package-states" -mindepth 1 -maxdepth 1 -name '*.testing' -mtime +7 \ + # packages remaining longer than $max_package_age_testing days in testing will be marked tested if no bug for them exists on FS32 + find "${work_dir}/package-states" -mindepth 1 -maxdepth 1 -name '*.testing' -mtime "+${max_package_age_testing}" \ -exec head -n1 {} \; | \ "${base_dir}/bin/modify-package-state" -n --tested /dev/stdin ;; @@ -1157,8 +1157,8 @@ print_list_of_archaic_packages() { if [ "${mod_commit_date}" -gt "${commit_date}" ]; then commit_date="${mod_commit_date}" fi - # packages remaining longer than 7 days on the build list - if [ "$((commit_date + 24*60*60*7))" -lt "$(date '+%s')" ]; then + # packages remaining longer than $max_package_age_build_list days on the build list + if [ "$((commit_date + 24*60*60*max_package_age_build_list))" -lt "$(date '+%s')" ]; then printf '%s %s %s %s\n' \ "${pkg}" \ "${rev}" \ @@ -1169,8 +1169,8 @@ print_list_of_archaic_packages() { "${work_dir}/build-list" ;; 'staging') - # packages remaining longer than 2 days in staging - find "${work_dir}/package-states" -mindepth 1 -maxdepth 1 -name '*.done' -mtime +2 -printf '%f\n' | \ + # packages remaining longer than $max_package_age_staging days in staging + find "${work_dir}/package-states" -mindepth 1 -maxdepth 1 -name '*.done' -mtime "+${max_package_age_staging}" -printf '%f\n' | \ sed ' s|\.done$|| ' diff --git a/conf/default.conf b/conf/default.conf index a31c41b..68efd5f 100755 --- a/conf/default.conf +++ b/conf/default.conf @@ -45,6 +45,13 @@ if [ -s "${base_dir}/conf/admin-gpg-keys" ]; then ) fi +# How long should packages in the pipeline be considered "fresh" (in days)? +# If a package surpasses this limit, it will be considered unimportant and won't +# block other packages anymore +max_package_age_build_list=7 +max_package_age_staging=2 +max_package_age_testing=7 + # to access the master mirror via rsync master_mirror_rsync_command='rsync --password-file=/home/slave/rsync.password' master_mirror_rsync_directory='rsync://buildmaster@mirror.archlinux32.org/packages32' |