From 90da9e16a8e812942c13fc445777b1612a214f50 Mon Sep 17 00:00:00 2001 From: Holger Levsen Date: Thu, 12 Mar 2015 11:59:55 +0100 Subject: reproducible: refactor --- bin/reproducible_common.sh | 37 +++++++++++++++++-------------------- bin/reproducible_html_dd_list.sh | 1 - bin/reproducible_html_graphs.sh | 1 - bin/reproducible_html_repo_stats.sh | 1 - 4 files changed, 17 insertions(+), 23 deletions(-) diff --git a/bin/reproducible_common.sh b/bin/reproducible_common.sh index d09c9726..fec3f114 100755 --- a/bin/reproducible_common.sh +++ b/bin/reproducible_common.sh @@ -73,26 +73,6 @@ META_PKGSET[11]="grml" META_PKGSET[12]="grml_build-depends" META_PKGSET[13]="maint_pkg-perl-maintainers" -init_html() { - MAINVIEW="stats" - ALLSTATES="reproducible FTBR FTBFS 404 not_for_us blacklisted" - ALLVIEWS="issues notes no_notes scheduled last_24h last_48h all_abc dd-list pkg_sets suite_stats repo_stats stats" - GLOBALVIEWS="issues notes no_notes scheduled repo_stats stats" - SUITEVIEWS="dd-list suite_stats" - SPOKENTARGET["issues"]="issues" - SPOKENTARGET["notes"]="packages with notes" - SPOKENTARGET["no_notes"]="packages without notes" - SPOKENTARGET["scheduled"]="currently scheduled" - SPOKENTARGET["last_24h"]="packages tested in the last 24h" - SPOKENTARGET["last_48h"]="packages tested in the last 48h" - SPOKENTARGET["all_abc"]="all tested packages (sorted alphabetically)" - SPOKENTARGET["dd-list"]="maintainers of unreproducible packages" - SPOKENTARGET["pkg_sets"]="package sets stats" - SPOKENTARGET["suite_stats"]="suite: $SUITE" - SPOKENTARGET["repo_stats"]="repositories overview" - SPOKENTARGET["stats"]="reproducible stats" -} - write_page() { echo "$1" >> $PAGE } @@ -126,6 +106,23 @@ write_icon() { write_page_header() { rm -f $PAGE + MAINVIEW="stats" + ALLSTATES="reproducible FTBR FTBFS 404 not_for_us blacklisted" + ALLVIEWS="issues notes no_notes scheduled last_24h last_48h all_abc dd-list pkg_sets suite_stats repo_stats stats" + GLOBALVIEWS="issues notes no_notes scheduled repo_stats stats" + SUITEVIEWS="dd-list suite_stats" + SPOKENTARGET["issues"]="issues" + SPOKENTARGET["notes"]="packages with notes" + SPOKENTARGET["no_notes"]="packages without notes" + SPOKENTARGET["scheduled"]="currently scheduled" + SPOKENTARGET["last_24h"]="packages tested in the last 24h" + SPOKENTARGET["last_48h"]="packages tested in the last 48h" + SPOKENTARGET["all_abc"]="all tested packages (sorted alphabetically)" + SPOKENTARGET["dd-list"]="maintainers of unreproducible packages" + SPOKENTARGET["pkg_sets"]="package sets stats" + SPOKENTARGET["suite_stats"]="suite: $SUITE" + SPOKENTARGET["repo_stats"]="repositories overview" + SPOKENTARGET["stats"]="reproducible stats" write_page "" write_page "" write_page "" diff --git a/bin/reproducible_html_dd_list.sh b/bin/reproducible_html_dd_list.sh index 264565a5..0b4985f0 100755 --- a/bin/reproducible_html_dd_list.sh +++ b/bin/reproducible_html_dd_list.sh @@ -13,7 +13,6 @@ common_init "$@" SUITE="sid" ARCH="amd64" -init_html VIEW=dd-list for SUITE in $SUITES ; do diff --git a/bin/reproducible_html_graphs.sh b/bin/reproducible_html_graphs.sh index 21aaac67..4a1c5e90 100755 --- a/bin/reproducible_html_graphs.sh +++ b/bin/reproducible_html_graphs.sh @@ -15,7 +15,6 @@ common_init "$@" # init some variables # ARCH="amd64" # we only care about amd64 status here (for now) -init_html # we only do stats up until yesterday... we also could do today too but not update the db yet... DATE=$(date -d "1 day ago" '+%Y-%m-%d') FORCE_DATE=$(date -d "2 day ago" '+%Y-%m-%d') diff --git a/bin/reproducible_html_repo_stats.sh b/bin/reproducible_html_repo_stats.sh index 72cd4e8c..a9b55744 100755 --- a/bin/reproducible_html_repo_stats.sh +++ b/bin/reproducible_html_repo_stats.sh @@ -12,7 +12,6 @@ common_init "$@" SUITE="sid" # for links in page ARCH="amd64" # same -init_html VIEW=repo_stats PAGE=index_${VIEW}.html -- cgit v1.2.3-70-g09d2