[Qa-jenkins-scm] [jenkins.debian.net] 06/06: reproducible: refactor, turn 'env. has changed during builds' irc notifications into mails

[Holger Levsen]

This is an automated email from the git hooks/post-receive script.

holger pushed a commit to branch master
in repository jenkins.debian.net.

commit 980d5bdb6ed0d45827ba92c3935eaa6d35d12bcd
Author: Holger Levsen <holger at layer-acht.org>
Date:   Sat Oct 10 02:31:30 2015 +0200

    reproducible: refactor, turn 'env. has changed during builds' irc notifications into mails
---
 bin/reproducible_build.sh       | 9 ++++-----
 bin/reproducible_maintenance.sh | 2 +-
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/bin/reproducible_build.sh b/bin/reproducible_build.sh
index 0ca68b3..15f0ab4 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 e955f7a..b7b8d5a 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

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/qa/jenkins.debian.net.git