summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHolger Levsen <holger@layer-acht.org>2014-10-05 02:49:24 +0200
committerHolger Levsen <holger@layer-acht.org>2014-10-05 02:49:24 +0200
commitd25c588b5537dbe157c8d06a57cecd0a149a71e0 (patch)
treef1ac4049d9d4c4226ac9558af6189166abefc91f
parentf545e58738fa618ce827e9013fc85f6c591ecc6a (diff)
downloadjenkins.debian.net-d25c588b5537dbe157c8d06a57cecd0a149a71e0.tar.xz
reproducible: rename diffp directory to dbd
-rwxr-xr-xbin/reproducible_build.sh12
-rwxr-xr-xbin/reproducible_stats.sh6
2 files changed, 9 insertions, 9 deletions
diff --git a/bin/reproducible_build.sh b/bin/reproducible_build.sh
index 9e175276..fd08e4f7 100755
--- a/bin/reproducible_build.sh
+++ b/bin/reproducible_build.sh
@@ -16,7 +16,7 @@ fi
# create dirs for results
mkdir -p results/
-mkdir -p /var/lib/jenkins/userContent/diffp/ /var/lib/jenkins/userContent/pbuilder/
+mkdir -p /var/lib/jenkins/userContent/dbd/ /var/lib/jenkins/userContent/pbuilder/
# this needs sid entries in sources.list:
grep deb-src /etc/apt/sources.list | grep sid
@@ -161,8 +161,8 @@ for SRCPACKAGE in ${PACKAGES} ; do
rm -f ./results/${LOGFILE} > /dev/null 2>&1
/var/lib/jenkins/debbindiff.git/debbindiff.py --html ./results/${LOGFILE} b1/${SRCPACKAGE}_${EVERSION}_amd64.changes b2/${SRCPACKAGE}_${EVERSION}_amd64.changes || true
if [ ! -f ./results/${LOGFILE} ] ; then
- rm -f /var/lib/jenkins/userContent/diffp/${SRCPACKAGE}_*.diffp.log > /dev/null 2>&1
- rm -f /var/lib/jenkins/userContent/diffp/${SRCPACKAGE}_*.debbindiff.html > /dev/null 2>&1
+ rm -f /var/lib/jenkins/userContent/dbd/${SRCPACKAGE}_*.diffp.log > /dev/null 2>&1
+ rm -f /var/lib/jenkins/userContent/dbd/${SRCPACKAGE}_*.debbindiff.html > /dev/null 2>&1
figlet ${SRCPACKAGE}
echo
echo "${SRCPACKAGE} built successfully and reproducibly."
@@ -170,9 +170,9 @@ for SRCPACKAGE in ${PACKAGES} ; do
let "COUNT_GOOD=COUNT_GOOD+1"
GOOD="${SRCPACKAGE} ${GOOD}"
else
- rm -f /var/lib/jenkins/userContent/diffp/${SRCPACKAGE}_*.diffp.log > /dev/null 2>&1
- rm -f /var/lib/jenkins/userContent/diffp/${SRCPACKAGE}_*.debbindiff.html > /dev/null 2>&1
- cp ./results/${LOGFILE} /var/lib/jenkins/userContent/diffp/
+ rm -f /var/lib/jenkins/userContent/dbd/${SRCPACKAGE}_*.diffp.log > /dev/null 2>&1
+ rm -f /var/lib/jenkins/userContent/dbd/${SRCPACKAGE}_*.debbindiff.html > /dev/null 2>&1
+ cp ./results/${LOGFILE} /var/lib/jenkins/userContent/dbd/
sqlite3 -init $INIT ${PACKAGES_DB} "REPLACE INTO source_packages VALUES (\"${SRCPACKAGE}\", \"${VERSION}\", \"unreproducible\", \"$DATE\", \"\")"
set +x
echo "Warning: ${SRCPACKAGE} failed to build reproducibly."
diff --git a/bin/reproducible_stats.sh b/bin/reproducible_stats.sh
index 5689fa01..c00c8a02 100755
--- a/bin/reproducible_stats.sh
+++ b/bin/reproducible_stats.sh
@@ -49,10 +49,10 @@ for PKG in $BAD ; do
VERSION=$(sqlite3 -init $INIT $PACKAGES_DB "SELECT version FROM source_packages WHERE name = \"$PKG\"")
# remove epoch
VERSION=$(echo $VERSION | cut -d ":" -f2)
- if [ -f "/var/lib/jenkins/userContent/diffp/${PKG}_${VERSION}.debbindiff.html" ] ; then
- htmlecho " <a href=\"$JENKINS_URL/userContent/diffp/${PKG}_${VERSION}.debbindiff.html\">$PKG</a> "
+ if [ -f "/var/lib/jenkins/userContent/dbd/${PKG}_${VERSION}.debbindiff.html" ] ; then
+ htmlecho " <a href=\"$JENKINS_URL/userContent/dbd/${PKG}_${VERSION}.debbindiff.html\">$PKG</a> "
else
- htmlecho " <a href=\"$JENKINS_URL/userContent/diffp/${PKG}_${VERSION}.diffp.log\">$PKG</a> "
+ htmlecho " <a href=\"$JENKINS_URL/userContent/dbd/${PKG}_${VERSION}.diffp.log\">$PKG</a> "
fi
done
htmlecho "</code></p>"