summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHolger Levsen <holger@layer-acht.org>2015-10-10 02:31:30 +0200
committerHolger Levsen <holger@layer-acht.org>2015-10-10 02:31:30 +0200
commit980d5bdb6ed0d45827ba92c3935eaa6d35d12bcd (patch)
tree3bf810c8b54919a36f7a578523261f9b98393972
parentef69476437c7071675a4a0867f91618c3540ecd6 (diff)
downloadjenkins.debian.net-980d5bdb6ed0d45827ba92c3935eaa6d35d12bcd.tar.xz
reproducible: refactor, turn 'env. has changed during builds' irc notifications into mails
-rwxr-xr-xbin/reproducible_build.sh9
-rwxr-xr-xbin/reproducible_maintenance.sh2
2 files changed, 5 insertions, 6 deletions
diff --git a/bin/reproducible_build.sh b/bin/reproducible_build.sh
index 0ca68b3d..15f0ab4a 100755
--- a/bin/reproducible_build.sh
+++ b/bin/reproducible_build.sh
@@ -270,11 +270,10 @@ unregister_build() {
NOTIFY=""
}
-handle_unhandled() {
+handle_env_changes() {
unregister_build
- MESSAGE="$BUILD_URL met an unhandled $1, please check."
- echo "$MESSAGE"
- irc_message "$MESSAGE"
+ MESSAGE="$(date -u ) - $BUILD_URL encountered a problem: $1"
+ echo -e "$MESSAGE" | tee -a /var/log/jenkins/reproducible-env-changes.log
# no need to slow down
exec /srv/jenkins/bin/abort.sh
exit 0
@@ -663,7 +662,7 @@ check_buildinfo() {
rm $TMPFILE1 $TMPFILE2
set -e
if [ $RESULT -eq 1 ] ; then
- handle_unhandled "problem: different packages were installed in the 1st+2nd builds and also in the 2nd+3rd builds"
+ handle_env_changes "different packages were installed in the 1st+2nd builds and also in the 2nd+3rd build.\n$(ls -l ./b1/$BUILDINFO) on $NODE1\n$(ls -l ./b2/$BUILDINFO) on $NODE2\n"
fi
fi
rm -f $TMPFILE1 $TMPFILE2
diff --git a/bin/reproducible_maintenance.sh b/bin/reproducible_maintenance.sh
index e955f7a8..b7b8d5a8 100755
--- a/bin/reproducible_maintenance.sh
+++ b/bin/reproducible_maintenance.sh
@@ -329,7 +329,7 @@ fi
# daily mails
if [ "$HOSTNAME" = "$MAINNODE" ] && [ $(date -u +%H) -eq 0 ] ; then
# once a day, send mail about builder problems
- for PROBLEM in /var/log/jenkins/reproducible-stale-builds.log /var/log/jenkins/reproducible-race-conditions.log /var/log/jenkins/reproducible-diskspace-issues.log /var/log/jenkins/reproducible-remote-error.log; do
+ for PROBLEM in /var/log/jenkins/reproducible-stale-builds.log /var/log/jenkins/reproducible-race-conditions.log /var/log/jenkins/reproducible-diskspace-issues.log /var/log/jenkins/reproducible-remote-error.log /var/log/jenkins/reproducible-env-changes.log ; do
if [ -s $PROBLEM ] ; then
TMPFILE=$(mktemp --tmpdir=$TEMPDIR maintenance-XXXXXXXXXXXX)
mv $PROBLEM $TMPFILE