diff options
| -rwxr-xr-x | bin/reproducible_common.sh | 18 | ||||
| -rwxr-xr-x | bin/reproducible_schedule_on_demand.sh | 3 | ||||
| -rwxr-xr-x | bin/reproducible_scheduler.sh | 5 |
3 files changed, 3 insertions, 23 deletions
diff --git a/bin/reproducible_common.sh b/bin/reproducible_common.sh index e379ad9a..120ea9e2 100755 --- a/bin/reproducible_common.sh +++ b/bin/reproducible_common.sh @@ -347,21 +347,3 @@ gather_stats() { PERCENT_NOTFORUS=$(echo "scale=1 ; ($COUNT_NOTFORUS*100/$COUNT_TOTAL)" | bc) PERCENT_SOURCELESS=$(echo "scale=1 ; ($COUNT_SOURCELESS*100/$COUNT_TOTAL)" | bc) } - -update_html_schedule() { - VIEW=scheduled - PAGE=index_${VIEW}.html - echo "$(date) - starting to write $PAGE page." - write_page_header $VIEW "Overview of ${SPOKENTARGET[$VIEW]}" - gather_schedule_stats - if [ ${COUNT_NEW_VERSIONS} -ne 0 ] ; then - write_page "<p>For ${COUNT_NEW_VERSIONS} packages newer versions are available which have not been tested yet.</p>" - fi - write_page "<p>${COUNT_SCHEDULED} packages are currently scheduled for testing: <code>" - force_package_targets $SCHEDULED - link_packages $SCHEDULED - write_page "</code></p>" - write_page_meta_sign - write_page_footer - publish_page -} diff --git a/bin/reproducible_schedule_on_demand.sh b/bin/reproducible_schedule_on_demand.sh index 0776f81c..b32061b9 100755 --- a/bin/reproducible_schedule_on_demand.sh +++ b/bin/reproducible_schedule_on_demand.sh @@ -56,8 +56,7 @@ MESSAGE="$TOTAL package(s) manually (re-)scheduled for immediate testing: ${PACK # finally schedule_packages -init_html -update_html_schedule +python3 -c "from reproducible_html_indexes import build_page; build_page('scheduled')" echo echo "$MESSAGE" kgb-client --conf /srv/jenkins/kgb/debian-reproducible.conf --relay-msg "$MESSAGE" diff --git a/bin/reproducible_scheduler.sh b/bin/reproducible_scheduler.sh index af7eb5e1..d033ca3e 100755 --- a/bin/reproducible_scheduler.sh +++ b/bin/reproducible_scheduler.sh @@ -150,10 +150,9 @@ schedule_packages() { # main # update_apt -init_html COUNT_SCHEDULED=$(sqlite3 ${PACKAGES_DB} 'SELECT count(name) FROM sources_scheduled') if [ $COUNT_SCHEDULED -gt 250 ] ; then - update_html_schedule + python3 -c "from reproducible_html_indexes import build_page; build_page('scheduled')" echo "$COUNT_SCHEDULED packages scheduled, nothing to do." exit 0 else @@ -211,7 +210,7 @@ MESSAGE="$MESSAGE and $AMOUNT packages with the same version again, for a total # finally schedule_packages -update_html_schedule +python3 -c "from reproducible_html_indexes import build_page; build_page('scheduled')" echo echo "$MESSAGE" kgb-client --conf /srv/jenkins/kgb/debian-reproducible.conf --relay-msg "$MESSAGE" |