summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHolger Levsen <holger@layer-acht.org>2014-09-29 18:12:23 +0200
committerHolger Levsen <holger@layer-acht.org>2014-09-29 18:12:23 +0200
commit76472612590f0c1ffa1dd105f6efbd096f69318d (patch)
tree12181f225165e4475e832e6db41a1403bde8f3f4
parent561eb28d84fe59f8ceeab93565cf9b8ca0302a41 (diff)
downloadjenkins.debian.net-76472612590f0c1ffa1dd105f6efbd096f69318d.tar.xz
reproducible: simplify handling of .diffp.log files
-rwxr-xr-xbin/reproducible_build.sh5
-rw-r--r--job-cfg/reproducible.yaml2
2 files changed, 2 insertions, 5 deletions
diff --git a/bin/reproducible_build.sh b/bin/reproducible_build.sh
index f75c0157..73d89f28 100755
--- a/bin/reproducible_build.sh
+++ b/bin/reproducible_build.sh
@@ -17,7 +17,7 @@ else
fi
# create dirs for results
-mkdir -p results/_success
+mkdir -p results/
mkdir -p /var/lib/jenkins/userContent/diffp/ /var/lib/jenkins/userContent/pbuilder/
# create sqlite db
@@ -123,7 +123,6 @@ for SRCPACKAGE in $PACKAGES ; do
LOGFILE=$(echo ${LOGFILE%.dsc}.diffp.log)
./misc.git/diffp b1/${SRCPACKAGE}_${VERSION}_amd64.changes b2/${SRCPACKAGE}_${VERSION}_amd64.changes | tee ./results/${LOGFILE}
if ! $(grep -qv '^\*\*\*\*\*' ./results/${LOGFILE}) ; then
- mv ./results/${LOGFILE} ./results/_success/
rm -f /var/lib/jenkins/userContent/diffp/${SRCPACKAGE}_*.diffp.log > /dev/null 2>&1
figlet ${SRCPACKAGE}
echo
@@ -131,7 +130,6 @@ for SRCPACKAGE in $PACKAGES ; do
sqlite3 -init $INIT $PACKAGES_DB "REPLACE INTO source_packages VALUES (\"${SRCPACKAGE}\", \"${VERSION}\", \"reproducible\", \"$DATE\", \"\")"
let "COUNT_GOOD=COUNT_GOOD+1"
GOOD="${SRCPACKAGE} ${GOOD}"
- touch results/___.dummy.log # not having any bad logs is not a reason for failure
else
rm -f /var/lib/jenkins/userContent/diffp/${SRCPACKAGE}_*.diffp.log > /dev/null 2>&1
cp ./results/${LOGFILE} /var/lib/jenkins/userContent/diffp/
@@ -139,7 +137,6 @@ for SRCPACKAGE in $PACKAGES ; do
sqlite3 -init $INIT $PACKAGES_DB "REPLACE INTO source_packages VALUES (\"${SRCPACKAGE}\", \"${VERSION}\", \"unreproducible\", \"$DATE\", \"\")"
let "COUNT_BAD=COUNT_BAD+1"
BAD="${SRCPACKAGE} ${BAD}"
- rm -f results/dummy.log 2>/dev/null # just cleanup
fi
rm b1 b2 -rf
else
diff --git a/job-cfg/reproducible.yaml b/job-cfg/reproducible.yaml
index 3f6c8381..26044cd6 100644
--- a/job-cfg/reproducible.yaml
+++ b/job-cfg/reproducible.yaml
@@ -37,7 +37,7 @@
- email:
recipients: 'jenkins+debian-reproducible holger@layer-acht.org reproducible-commits@lists.alioth.debian.org'
- archive:
- artifacts: 'results/*.*, results/_success/*.*'
+ artifacts: 'results/*.*'
latest_only: false
- logparser:
parse-rules: '/srv/jenkins/logparse/reproducible.rules'