From 1269c81ffaeb537053318fed6469a51f935bf3b2 Mon Sep 17 00:00:00 2001 From: Holger Levsen Date: Fri, 18 Dec 2015 20:47:16 +0100 Subject: reproducible debian armhf: also test experimental --- bin/reproducible_blacklist.sh | 4 ++-- bin/reproducible_common.py | 2 +- bin/reproducible_common.sh | 4 ++-- bin/reproducible_html_dashboard.sh | 17 +++++++++-------- bin/reproducible_html_indexes.py | 4 ++-- bin/reproducible_html_notes.py | 2 +- bin/reproducible_html_packages.py | 6 +++--- bin/reproducible_maintenance.sh | 4 ++-- bin/reproducible_scheduler.py | 16 ++++++++-------- 9 files changed, 30 insertions(+), 29 deletions(-) (limited to 'bin') diff --git a/bin/reproducible_blacklist.sh b/bin/reproducible_blacklist.sh index 355aa7bc..a22b48f7 100755 --- a/bin/reproducible_blacklist.sh +++ b/bin/reproducible_blacklist.sh @@ -69,8 +69,8 @@ case $SUITE in sid) echo "WARNING: sid has been renamed to unstable." SUITE=unstable ;; - unstable) ;; - testing|experimental) if [ "$ARCH" = "armhf" ] ; then echo "Only unstable is tested for $ARCH, exiting." ; exit 0 ; fi + unstable|experimental) ;; + testing) if [ "$ARCH" = "armhf" ] ; then echo "Testing is not yet tested on $ARCH, exiting." ; exit 0 ; fi ;; *) echo "$SUITE is not a valid suite". explain_syntax diff --git a/bin/reproducible_common.py b/bin/reproducible_common.py index 47dc4fe9..e4aa9006 100755 --- a/bin/reproducible_common.py +++ b/bin/reproducible_common.py @@ -299,7 +299,7 @@ def _gen_links(suite, arch): continue html += link[1].format(suite=suite, arch=arch) + '\n' for i in SUITES: # suite links - if arch == 'armhf' and i != 'unstable': + if arch == 'armhf' and i == 'testing': continue html += '
  • suite: ' + i + '
    • ' if arch == 'amd64': diff --git a/bin/reproducible_common.sh b/bin/reproducible_common.sh index f6237064..2dfdca77 100755 --- a/bin/reproducible_common.sh +++ b/bin/reproducible_common.sh @@ -253,8 +253,8 @@ write_page_header() { done if [ "$TARGET" = "suite_stats" ] ; then for i in $SUITES ; do - if [ "$i" != "unstable" ] && [ "$ARCH" = "armhf" ] ; then - # only unstable is tested on armhf atm + if [ "$i" = "testing" ] && [ "$ARCH" = "armhf" ] ; then + # only unstable and experimental are tested on armhf atm continue fi write_page "
  • suite: $i
    • " diff --git a/bin/reproducible_html_dashboard.sh b/bin/reproducible_html_dashboard.sh index c0784fbb..a6211936 100755 --- a/bin/reproducible_html_dashboard.sh +++ b/bin/reproducible_html_dashboard.sh @@ -294,12 +294,12 @@ write_build_performance_stats() { fi write_page "" AGE_UNSTABLE=$(sqlite3 -init ${INIT} ${PACKAGES_DB} "SELECT CAST(max(oldest_reproducible, oldest_unreproducible, oldest_FTBFS) AS INTEGER) FROM ${TABLE[2]} WHERE suite='unstable' AND architecture='$ARCH' AND datum='$DATE'") + AGE_EXPERIMENTAL=$(sqlite3 -init ${INIT} ${PACKAGES_DB} "SELECT CAST(max(oldest_reproducible, oldest_unreproducible, oldest_FTBFS) AS INTEGER) FROM ${TABLE[2]} WHERE suite='experimental' AND architecture='$ARCH' AND datum='$DATE'") if [ "$ARCH" != "armhf" ] ; then AGE_TESTING=$(sqlite3 -init ${INIT} ${PACKAGES_DB} "SELECT CAST(max(oldest_reproducible, oldest_unreproducible, oldest_FTBFS) AS INTEGER) FROM ${TABLE[2]} WHERE suite='testing' AND architecture='$ARCH' AND datum='$DATE'") - AGE_EXPERIMENTAL=$(sqlite3 -init ${INIT} ${PACKAGES_DB} "SELECT CAST(max(oldest_reproducible, oldest_unreproducible, oldest_FTBFS) AS INTEGER) FROM ${TABLE[2]} WHERE suite='experimental' AND architecture='$ARCH' AND datum='$DATE'") write_page "" else - write_page "" + write_page "" fi RESULT=$(sqlite3 -init ${INIT} ${PACKAGES_DB} "SELECT CAST(AVG(r.build_duration) AS INTEGER) FROM results AS r JOIN sources AS s ON r.package_id=s.id WHERE r.build_duration!='' AND r.build_duration!='0' AND r.build_date LIKE '%$DATE%' AND s.architecture='$ARCH'") MIN=$(echo $RESULT/60|bc) @@ -324,7 +324,7 @@ write_suite_table() { write_page "

    " write_page "

    Build statistics for $ARCH
    oldest $ARCH build result in testing / unstable / experimental$AGE_TESTING / $AGE_UNSTABLE / $AGE_EXPERIMENTAL days
    oldest $ARCH build result in unstable $AGE_UNSTABLE days
    oldest $ARCH build result in unstable / experimental $AGE_UNSTABLE / $AGE_EXPERIMENTAL days
    " for SUITE in $SUITES ; do - if [ "$ARCH" = "armhf" ] && [ "$SUITE" != "unstable" ] ; then + if [ "$ARCH" = "armhf" ] && [ "$SUITE" = "testing" ] ; then continue fi gather_suite_arch_stats @@ -494,10 +494,11 @@ create_dashboard_page() { write_page "

    " write_page "

    " write_suite_table - SUITE="unstable" - write_page " \"$SUITE/$ARCH" + for SUITE in unstable experimental ; do + write_page " \"$SUITE/$ARCH" + write_page " \"age" + done write_page " \"${MAINLABEL[$i]}\"" - write_page " \"age" write_build_performance_stats write_page "

    " write_page "

    " @@ -517,8 +518,8 @@ update_bug_stats update_notes_stats for ARCH in ${ARCHS} ; do for SUITE in $SUITES ; do - if [ "$SUITE" != "unstable" ] && [ "$ARCH" = "armhf" ] ; then - # we only test unstable on armhf atm + if [ "$SUITE" = "testing" ] && [ "$ARCH" = "armhf" ] ; then + # we only test unstable and experimental on armhf atm continue fi update_suite_arch_stats diff --git a/bin/reproducible_html_indexes.py b/bin/reproducible_html_indexes.py index e79c04ca..6923798c 100755 --- a/bin/reproducible_html_indexes.py +++ b/bin/reproducible_html_indexes.py @@ -512,7 +512,7 @@ def build_page(page, suite=None, arch=None): else: for suite in SUITES: for arch in ARCHS: - if arch == 'armhf' and suite != 'unstable': + if arch == 'armhf' and suite == 'testing': continue log.debug('global page ยง' + section['db_status'] + ' in ' + page + ' for ' + suite + '/' + arch) @@ -539,7 +539,7 @@ bugs = get_bugs() # this variable should not be global, else merely importing _h if __name__ == '__main__': for arch in ARCHS: for suite in SUITES: - if arch == 'armhf' and suite != 'unstable': + if arch == 'armhf' and suite == 'testing': continue for page in pages.keys(): if 'global' not in pages[page] or not pages[page]['global']: diff --git a/bin/reproducible_html_notes.py b/bin/reproducible_html_notes.py index ec44ae1e..320f75a1 100755 --- a/bin/reproducible_html_notes.py +++ b/bin/reproducible_html_notes.py @@ -439,7 +439,7 @@ if __name__ == '__main__': gen_packages_html([Package(x) for x in notes]) for suite in SUITES: for arch in ARCHS: - if arch == 'armhf' and suite != 'unstable': + if arch == 'armhf' and suite == 'testing': continue build_page('notes', suite, arch) build_page('no_notes', suite, arch) diff --git a/bin/reproducible_html_packages.py b/bin/reproducible_html_packages.py index 52aca925..7d6db715 100755 --- a/bin/reproducible_html_packages.py +++ b/bin/reproducible_html_packages.py @@ -172,7 +172,7 @@ def gen_suites_links(package, current_suite, current_arch): html += tab + '
  • {}\n'.format(a) html += tab + '
    • suiteall sources packagesreproducible packagesunreproducible packagespackages failing to buildother packages