summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHolger Levsen <holger@layer-acht.org>2015-12-20 19:46:05 +0100
committerHolger Levsen <holger@layer-acht.org>2015-12-20 19:46:12 +0100
commitd12598810bb480137166282a06a4a9ee5a354774 (patch)
tree8031117161fb21354bc7ef56d2b8568d1695ba27
parent16b8750afdb9275f645e361fea85a5405568fdb2 (diff)
downloadjenkins.debian.net-d12598810bb480137166282a06a4a9ee5a354774.tar.xz
reproducible armhf: really make pkg sets handle multiple archs correctly
-rwxr-xr-xbin/reproducible_common.sh22
-rwxr-xr-xbin/reproducible_html_pkg_sets.sh4
2 files changed, 16 insertions, 10 deletions
diff --git a/bin/reproducible_common.sh b/bin/reproducible_common.sh
index 23a1eb9d..e2ee0aa2 100755
--- a/bin/reproducible_common.sh
+++ b/bin/reproducible_common.sh
@@ -602,22 +602,28 @@ create_png_from_table() {
if [ $1 -eq 3 ] || [ $1 -eq 4 ] || [ $1 -eq 5 ] || [ $1 -eq 8 ] ; then
# TABLE[3+4+5] don't have a suite column: (and TABLE[8] (and 9) is faked, based on 3)
WHERE_EXTRA=""
- elif [ $1 -eq 6 ] ; then
- # 6 is special too:
- WHERE_EXTRA="WHERE suite = '$SUITE' and meta_pkg = '$3'"
fi
- if [ $1 -eq 0 ] || [ $1 -eq 2 ] ; then
- # TABLE[0+2] have a architecture column:
+ if [ $1 -eq 0 ] || [ $1 -eq 2 ] || [ $1 -eq 6 ] ; then
+ # TABLE[0+2+6] have a architecture column:
WHERE_EXTRA="$WHERE_EXTRA AND architecture = \"$ARCH\""
- if [ $1 -eq 2 ] && [ "$ARCH" = "armhf" ] ; then
- # armhf was only build since 2015-08-30
- WHERE_EXTRA="$WHERE_EXTRA AND datum >= '2015-08-30'"
+ if [ "$ARCH" = "armhf" ] ; then
+ if [ $1 -eq 2 ] ; then
+ # unstable/armhf was only build since 2015-08-30 (and experimental/armhf since 2015-12-19)
+ WHERE_EXTRA="$WHERE_EXTRA AND datum >= '2015-08-30'"
+ elif [ $1 -eq 6 ] ; then
+ # armhf only has pkg sets since its complete, aka 2015-12-19
+ WHERE_EXTRA="$WHERE_EXTRA AND datum >= '2015-12-19'"
+ fi
fi
# testing/amd64 was only build since...
# WHERE2_EXTRA="WHERE s.datum >= '2015-03-08'"
# experimental/amd64 was only build since...
# WHERE2_EXTRA="WHERE s.datum >= '2015-02-28'"
fi
+ if [ $1 -eq 6 ] ; then
+ # 6 is very special too...
+ WHERE_EXTRA="$WHERE_EXTRA and meta_pkg = '$3'"
+ fi
# run query
if [ $1 -eq 1 ] ; then
# not sure if it's worth to generate the following query...
diff --git a/bin/reproducible_html_pkg_sets.sh b/bin/reproducible_html_pkg_sets.sh
index dc7d294c..55908eea 100755
--- a/bin/reproducible_html_pkg_sets.sh
+++ b/bin/reproducible_html_pkg_sets.sh
@@ -76,8 +76,8 @@ update_meta_pkg_stats() {
META_RESULT=true
gather_meta_stats $i
if $META_RESULT ; then
- sqlite3 -init ${INIT} ${PACKAGES_DB} "INSERT INTO ${TABLE[6]} VALUES (\"$DATE\", \"$SUITE\", \"${META_PKGSET[$i]}\", $COUNT_META_GOOD, $COUNT_META_BAD, $COUNT_META_UGLY, $COUNT_META_REST)"
- echo "Updating meta pkg set stats for ${META_PKGSET[$1]} in $SUITE on $DATE."
+ sqlite3 -init ${INIT} ${PACKAGES_DB} "INSERT INTO ${TABLE[6]} VALUES (\"$DATE\", \"$SUITE\", \"$ARCH\", \"${META_PKGSET[$i]}\", $COUNT_META_GOOD, $COUNT_META_BAD, $COUNT_META_UGLY, $COUNT_META_REST)"
+ echo "Updating meta pkg set stats for ${META_PKGSET[$1]} in $SUITE/$ARCH on $DATE."
fi
echo "Touching $SUITE/$ARCH/${TABLE[6]}_${META_PKGSET[$i]}.png..."
touch -d "$FORCE_DATE 00:00 UTC" $BASE/$SUITE/$ARCH/${TABLE[6]}_${META_PKGSET[$i]}.png