diff options
| -rw-r--r-- | TODO | 4 | ||||
| -rwxr-xr-x | bin/reproducible_blacklist.sh | 2 | ||||
| -rwxr-xr-x | bin/reproducible_build.sh | 2 | ||||
| -rwxr-xr-x | bin/reproducible_common.sh | 4 | ||||
| -rwxr-xr-x | bin/reproducible_html_all_packages.sh | 2 | ||||
| -rwxr-xr-x | bin/reproducible_html_notes.py | 6 | ||||
| -rwxr-xr-x | bin/reproducible_html_packages.py | 4 |
7 files changed, 11 insertions, 13 deletions
@@ -145,10 +145,8 @@ properties: * | h01ger guesstimates that we would go from 300-600 builds per day to 100-200 with qemubuilder <h01ger> | but those qemubuilders would only get 4 or 8gb ram... maybe 6. and that will have a huge impact -* cleanup+rename: -** process_packages() (defined in common.sh...) -* merge reproducible_setup_schroot in schroot-create or delete the latter? +* merge reproducible_setup_schroot in schroot-create or delete the latter? * include no js header in the css * use one css for all, not two minimally different ones * graph oldest build age - in days diff --git a/bin/reproducible_blacklist.sh b/bin/reproducible_blacklist.sh index 6b7c41f4..a6f02155 100755 --- a/bin/reproducible_blacklist.sh +++ b/bin/reproducible_blacklist.sh @@ -51,7 +51,7 @@ fi # finally blacklist_packages -process_packages $PACKAGES +gen_packages_html $PACKAGES echo echo "$MESSAGE" kgb-client --conf /srv/jenkins/kgb/debian-reproducible.conf --relay-msg "$MESSAGE" diff --git a/bin/reproducible_build.sh b/bin/reproducible_build.sh index c05e80f6..2e612d1c 100755 --- a/bin/reproducible_build.sh +++ b/bin/reproducible_build.sh @@ -32,7 +32,7 @@ update_db_and_html() { # where the page was already updated after the build started, probably # through notes being updated.) touch -d $PREDATE /var/lib/jenkins/userContent/rb-pkg/${SRCPACKAGE}.html - process_packages $SRCPACKAGE + gen_packages_html $SRCPACKAGE echo echo "Successfully updated the database and updated $REPRODUCIBLE_URL/rb-pkg/$SRCPACKAGE.html" echo diff --git a/bin/reproducible_common.sh b/bin/reproducible_common.sh index 1c1f331e..40e36a0c 100755 --- a/bin/reproducible_common.sh +++ b/bin/reproducible_common.sh @@ -300,7 +300,7 @@ link_packages() { done } -process_packages() { +gen_packages_html() { CWD=$(pwd) cd /srv/jenkins/bin for (( i=1; i<$#+1; i=i+100 )) ; do @@ -314,7 +314,7 @@ process_packages() { fi done string+=']' - python3 -c "from reproducible_html_packages import process_packages; process_packages(${string}, no_clean=True)" + python3 -c "from reproducible_html_packages import gen_packages_html; gen_packages_html(${string}, no_clean=True)" done python3 -c "from reproducible_html_packages import purge_old_pages; purge_old_pages()" cd "$CWD" diff --git a/bin/reproducible_html_all_packages.sh b/bin/reproducible_html_all_packages.sh index b93c940a..7563d423 100755 --- a/bin/reproducible_html_all_packages.sh +++ b/bin/reproducible_html_all_packages.sh @@ -21,5 +21,5 @@ init_html PACKAGES=$(sqlite3 -init $INIT $PACKAGES_DB "SELECT name FROM source_packages WHERE status != \"\"") COUNT_TOTAL=$(sqlite3 -init $INIT $PACKAGES_DB "SELECT COUNT(name) FROM source_packages WHERE status != \"\"") echo "$(date) - processing $COUNT_TOTAL packages... this will take a while." -process_packages ${PACKAGES} +gen_packages_html ${PACKAGES} diff --git a/bin/reproducible_html_notes.py b/bin/reproducible_html_notes.py index faa8807e..6edd0580 100755 --- a/bin/reproducible_html_notes.py +++ b/bin/reproducible_html_notes.py @@ -11,7 +11,7 @@ import yaml from reproducible_common import * -from reproducible_html_packages import process_packages +from reproducible_html_packages import gen_packages_html NOTES = 'packages.yml' ISSUES = 'issues.yml' @@ -268,7 +268,7 @@ def purge_old_notes(notes): os.remove(NOTES_PATH + '/' + page) removed_pages.append(pkg) if removed_pages: - process_packages(removed_pages) + gen_packages_html(removed_pages) def iterate_over_notes(notes): num_notes = str(len(notes)) @@ -421,4 +421,4 @@ if __name__ == '__main__': index_notes(notes, bugs) index_no_notes(notes, bugs) purge_old_notes(notes) - process_packages(notes) # regenerate all rb-pkg/ pages + gen_packages_html(notes) # regenerate all rb-pkg/ pages diff --git a/bin/reproducible_html_packages.py b/bin/reproducible_html_packages.py index b449dcc9..6b0306a3 100755 --- a/bin/reproducible_html_packages.py +++ b/bin/reproducible_html_packages.py @@ -131,7 +131,7 @@ def gen_bugs_links(package, bugs): return html -def process_packages(packages, no_clean=False): +def gen_packages_html(packages, no_clean=False): """ generate the /rb-pkg/package.html page packages should be a list @@ -172,7 +172,7 @@ def gen_all_rb_pkg_pages(no_clean=False): rows = query_db(query) pkgs = [str(i[0]) for i in rows] log.info('Processing all the package pages, ' + str(len(pkgs))) - process_packages(pkgs, no_clean) + gen_packages_html(pkgs, no_clean) def purge_old_pages(): presents = sorted(os.listdir(RB_PKG_PATH)) |