summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHolger Levsen <holger@layer-acht.org>2014-10-08 13:10:36 +0200
committerHolger Levsen <holger@layer-acht.org>2014-10-08 13:10:36 +0200
commit01a5e0722d73b7c318543964761ae09cbe014d2a (patch)
treeda66afc9def212ebe47eb2dd3cae06ca3e602257
parent430708e79557eb9cb83b051019a62e6c32a6b89c (diff)
downloadjenkins.debian.net-01a5e0722d73b7c318543964761ae09cbe014d2a.tar.xz
reproducinle: brute force fixup of debbindiff CSS
-rw-r--r--TODO1
-rwxr-xr-xbin/reproducible_build.sh11
2 files changed, 11 insertions, 1 deletions
diff --git a/TODO b/TODO
index c6573225..8133feeb 100644
--- a/TODO
+++ b/TODO
@@ -97,6 +97,7 @@ See link:https://jenkins.debian.net/userContent/about.html["about jenkins.debian
*** then schedule up to 100 new versions (but not more than 200 in total)
** if thats less than 200 and in total there are less then 300 scheduled:
*** schedule up to 100 same versions, older than a week
+*** schedule the oldest FTBFS packages - once every other scheduler run, which is run 24x a day
** another job: reschedule packages supplied by params (first those initital ones but also on demand, via cli or webgui)
** dont reschedule packages which 404ed or are blacklisted
diff --git a/bin/reproducible_build.sh b/bin/reproducible_build.sh
index 2d34581f..9606c606 100755
--- a/bin/reproducible_build.sh
+++ b/bin/reproducible_build.sh
@@ -193,7 +193,16 @@ for SRCPACKAGE in ${PACKAGES} ; do
GOOD="${SRCPACKAGE} ${GOOD}"
else
cp b1/${BUILDINFO} /var/lib/jenkins/userContent/buildinfo/ || true
- mv ./${LOGFILE} /var/lib/jenkins/userContent/dbd/ || true
+ if [ -f ./${LOGFILE} ] ; then
+ # hack around html file to include custom .css
+ # should really be fixed in debbindiff and just moved....
+ # FIXME: file a bug against debbindiff for external CSS support
+ if grep -q "Generated by debbindiff 3" ./${LOGFILE} ; then
+ sed '/\<style\>/,/<\/style>/{//!d}' ./${LOGFILE} |grep -v "style>" | sed -s 's#</head># <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />\n <link href="../static/style_dbd.css" type="text/css" rel="stylesheet" />\n</head>#' > /var/lib/jenkins/userContent/dbd/${LOGFILE}
+ else
+ mv ./${LOGFILE} /var/lib/jenkins/userContent/dbd/
+ fi
+ fi
sqlite3 -init $INIT ${PACKAGES_DB} "REPLACE INTO source_packages VALUES (\"${SRCPACKAGE}\", \"${VERSION}\", \"unreproducible\", \"$DATE\")"
set +x
echo -n "Warning: ${SRCPACKAGE} failed to build reproducibly."