From 3ce1ce586c0d8079e8ce9ebe5fd1c2f8b66dfb92 Mon Sep 17 00:00:00 2001
From: Valerie R Young
Date: Wed, 8 Jun 2016 19:09:56 -0400
Subject: reproducible debian: bug fix: only debian html belongs in
tests.r-b.org/debian
---
bin/reproducible_html_dashboard.sh | 34 +++++++++++++++++-----------------
1 file changed, 17 insertions(+), 17 deletions(-)
(limited to 'bin/reproducible_html_dashboard.sh')
diff --git a/bin/reproducible_html_dashboard.sh b/bin/reproducible_html_dashboard.sh
index ba3dfff3..fb1d5654 100755
--- a/bin/reproducible_html_dashboard.sh
+++ b/bin/reproducible_html_dashboard.sh
@@ -140,9 +140,9 @@ update_suite_arch_stats() {
PREFIX=$SUITE/$ARCH
fi
# force regeneration of the image if it exists
- if [ -f $BASE/$PREFIX/${TABLE[$i]}.png ] ; then
+ if [ -f $DEBIAN_BASE/$PREFIX/${TABLE[$i]}.png ] ; then
echo "Touching $PREFIX/${TABLE[$i]}.png..."
- touch -d "$FORCE_DATE 00:00 UTC" $BASE/$PREFIX/${TABLE[$i]}.png
+ touch -d "$FORCE_DATE 00:00 UTC" $DEBIAN_BASE/$PREFIX/${TABLE[$i]}.png
fi
done
fi
@@ -239,7 +239,7 @@ update_bug_stats() {
local i=0
for i in 3 7 8 9 ; do
echo "Touching ${TABLE[$i]}.png..."
- touch -d "$FORCE_DATE 00:00 UTC" $BASE/${TABLE[$i]}.png
+ touch -d "$FORCE_DATE 00:00 UTC" $DEBIAN_BASE/${TABLE[$i]}.png
done
fi
fi
@@ -433,10 +433,10 @@ create_suite_arch_stats_page() {
write_icon
write_page "$COUNT_BLACKLISTED ($PERCENT_BLACKLISTED%) blacklisted packages neither.
"
write_page ""
- write_page " "
+ write_page " "
for i in 0 2 ; do
# recreate png once a day
- if [ ! -f $BASE/$SUITE/$ARCH/${TABLE[$i]}.png ] || [ $DUMMY_FILE -nt $BASE/$SUITE/$ARCH/${TABLE[$i]}.png ] ; then
+ if [ ! -f $DEBIAN_BASE/$SUITE/$ARCH/${TABLE[$i]}.png ] || [ $DUMMY_FILE -nt $DEBIAN_BASE/$SUITE/$ARCH/${TABLE[$i]}.png ] ; then
create_png_from_table $i $SUITE/$ARCH/${TABLE[$i]}.png
fi
done
@@ -453,7 +453,7 @@ write_meta_pkg_graphs_links () {
for i in $(seq 1 ${#META_PKGSET[@]}) ; do
THUMB=${TABLE[6]}_${META_PKGSET[$i]}-thumbnail.png
LABEL="Reproducibility status for packages in $SUITE/$ARCH from '${META_PKGSET[$i]}'"
- write_page ""
+ write_page ""
done
write_page "
"
}
@@ -472,7 +472,7 @@ create_dashboard_page() {
# write suite graphs
for ARCH in ${ARCHS} ; do
for SUITE in $SUITES ; do
- write_page " "
+ write_page " "
done
SUITE="unstable"
if [ "$ARCH" = "amd64" ] ; then
@@ -489,7 +489,7 @@ create_dashboard_page() {
done
write_page ""
ARCH="amd64"
- write_page "identified distinct and categorized issues | $ISSUES | |
"
+ write_page "identified distinct and categorized issues | $ISSUES | |
"
write_page "total number of identified issues in packages | $COUNT_ISSUES | |
"
write_page "packages with notes about these issues | $NOTES | |
"
@@ -502,7 +502,7 @@ create_dashboard_page() {
SUITE="unstable"
gather_suite_arch_stats
RESULT=$(sqlite3 -init ${INIT} ${PACKAGES_DB} "SELECT COUNT(*) FROM (SELECT s.id FROM sources AS s JOIN results AS r ON r.package_id=s.id WHERE r.status IN ('unreproducible', 'FTBFS', 'blacklisted') AND s.id NOT IN (SELECT package_id FROM notes) AND s.suite='$SUITE' AND s.architecture='$ARCH')")
- TD_PKG_NOISSUES="$TD_PKG_NOISSUES$RESULT / $(echo "scale=1 ; ($RESULT*100/$COUNT_TOTAL)" | bc)% | "
+ TD_PKG_NOISSUES="$TD_PKG_NOISSUES$RESULT / $(echo "scale=1 ; ($RESULT*100/$COUNT_TOTAL)" | bc)% | "
RESULT=$(sqlite3 -init ${INIT} ${PACKAGES_DB} "SELECT COUNT(*) FROM (SELECT s.id FROM sources AS s JOIN results AS r ON r.package_id=s.id WHERE r.status='unreproducible' AND s.id NOT IN (SELECT package_id FROM notes) AND s.suite='$SUITE' AND s.architecture='$ARCH')")
TD_PKG_FTBR="$TD_PKG_FTBR$RESULT / $(echo "scale=1 ; ($RESULT*100/$COUNT_TOTAL)" | bc)% | "
RESULT=$(sqlite3 -init ${INIT} ${PACKAGES_DB} "SELECT COUNT(*) FROM (SELECT s.id FROM sources AS s JOIN results AS r ON r.package_id=s.id WHERE r.status='FTBFS' AND s.id NOT IN (SELECT package_id FROM notes) AND s.suite='$SUITE' AND s.architecture='$ARCH')")
@@ -532,7 +532,7 @@ create_dashboard_page() {
wc -l) | "
fi
RESULT=$(cat /srv/reproducible-results/modified_in_sid.txt || echo "unknown") # written by reproducible_html_repository_comparison.sh
- write_page "packages modified in our toolchain (in unstable) | $(echo $RESULT) | |
"
+ write_page "packages modified in our toolchain (in unstable) | $(echo $RESULT) | |
"
RESULT=$(cat /srv/reproducible-results/modified_in_exp.txt || echo "unknown") # written by reproducible_html_repository_comparison.sh
write_page " - (in experimental) | $(echo $RESULT) | |
"
RESULT=$(cat /srv/reproducible-results/binnmus_needed.txt || echo "unknown") # written by reproducible_html_repository_comparison.sh
@@ -545,9 +545,9 @@ create_dashboard_page() {
write_page ""
# do other global graphs
for i in 8 9 3 7 4 5 ; do
- write_page " "
+ write_page " "
# redo pngs once a day
- if [ ! -f $BASE/${TABLE[$i]}.png ] || [ $DUMMY_FILE -nt $BASE/${TABLE[$i]}.png ] ; then
+ if [ ! -f $DEBIAN_BASE/${TABLE[$i]}.png ] || [ $DUMMY_FILE -nt $DEBIAN_BASE/${TABLE[$i]}.png ] ; then
create_png_from_table $i ${TABLE[$i]}.png
fi
done
@@ -557,7 +557,7 @@ create_dashboard_page() {
write_page "
There are some problems in this test setup itself too. And there is documentation too, in case you missed the link at the top. Feedback is very much appreciated.
"
# the end
write_page_footer
- cp $PAGE $BASE/reproducible.html
+ cp $PAGE $DEBIAN_BASE/reproducible.html
publish_page
}
@@ -574,8 +574,8 @@ create_performance_page() {
# arch performance stats
write_page ""
for ARCH in ${ARCHS} ; do
- write_page " "
- if [ ! -f $BASE/${TABLE[1]}_$ARCH.png ] || [ $DUMMY_FILE -nt $BASE/${TABLE[1]}_$ARCH.png ] ; then
+ write_page " "
+ if [ ! -f $DEBIAN_BASE/${TABLE[1]}_$ARCH.png ] || [ $DUMMY_FILE -nt $DEBIAN_BASE/${TABLE[1]}_$ARCH.png ] ; then
create_png_from_table 1 ${TABLE[1]}_$ARCH.png
fi
done
@@ -585,14 +585,14 @@ create_performance_page() {
write_page "
"
for ARCH in ${ARCHS} ; do
for SUITE in $SUITES ; do
- write_page " "
+ write_page " "
done
write_page "
"
done
# the end
write_page "Daily individual build node performance stats are available as well as views of oldest results for"
for ARCH in ${ARCHS} ; do
- write_page " $ARCH"
+ write_page " $ARCH"
done
write_page ".
"
write_page_footer
--
cgit v1.2.3-70-g09d2