diff options
| author | Holger Levsen <holger@layer-acht.org> | 2015-03-02 01:38:47 +0100 |
|---|---|---|
| committer | Holger Levsen <holger@layer-acht.org> | 2015-03-02 01:38:47 +0100 |
| commit | 1c25dc1b858e7bb93812af20d52565238a6db14c (patch) | |
| tree | 0356d88e4577bfde4a5b64be38aa25df45b5f474 /bin | |
| parent | 996d0f1ff843fe118e91b1fcec7d588530aca015 (diff) | |
| download | jenkins.debian.net-1c25dc1b858e7bb93812af20d52565238a6db14c.tar.xz | |
reproducible: various small fixes for multi-suite
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/reproducible_common.sh | 5 | ||||
| -rwxr-xr-x | bin/reproducible_html_graphs.sh | 6 |
2 files changed, 7 insertions, 4 deletions
diff --git a/bin/reproducible_common.sh b/bin/reproducible_common.sh index 2bec690d..8e6d30bb 100755 --- a/bin/reproducible_common.sh +++ b/bin/reproducible_common.sh @@ -69,7 +69,6 @@ META_PKGSET[12]="grml_build-depends" META_PKGSET[13]="maint_pkg-perl-maintainers" init_html() { - SUITE=sid 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 repo_stats pkg_sets stats" @@ -90,7 +89,7 @@ init_html() { SPOKENTARGET["repo_stats"]="statistics about the reproducible builds apt repository" SPOKENTARGET["pkg_sets"]="statistics about reproducible builds of specific package sets" SPOKENTARGET["stats"]="various statistics about reproducible builds" - # query some data we need everywhere (relative to sid, we care only about sid here) + # query some data we need everywhere AMOUNT=$(sqlite3 -init $INIT $PACKAGES_DB "SELECT count(*) FROM sources WHERE suite=\"${SUITE}\"") COUNT_TOTAL=$(sqlite3 -init $INIT $PACKAGES_DB "SELECT COUNT(*) FROM results AS r JOIN sources AS s ON r.package_id=s.id WHERE s.suite=\"${SUITE}\"") COUNT_GOOD=$(sqlite3 -init $INIT $PACKAGES_DB "SELECT COUNT(*) FROM results AS r JOIN sources AS s ON r.package_id=s.id WHERE s.suite=\"${SUITE}\" AND r.status=\"reproducible\"") @@ -182,7 +181,7 @@ write_page_meta_sign() { } publish_page() { - cp $PAGE /var/lib/jenkins/userContent/ + cp $PAGE /var/lib/jenkins/userContent/$1/ if [ "$VIEW" = "$MAINVIEW" ] ; then cp $PAGE /var/lib/jenkins/userContent/reproducible.html fi diff --git a/bin/reproducible_html_graphs.sh b/bin/reproducible_html_graphs.sh index 14d6679c..d8b082a1 100755 --- a/bin/reproducible_html_graphs.sh +++ b/bin/reproducible_html_graphs.sh @@ -291,8 +291,12 @@ for i in 0 3 4 5 1 ; do done write_page "</p>" write_page_footer -publish_page +publish_page $SUITE +if [ "$SUITE" = "experimental" ] ; then + # no package sets page for experimental + exit 0 +fi VIEW=pkg_sets PAGE=index_${VIEW}.html echo "$(date) - starting to write $PAGE page." |