summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xbin/reproducible_build.sh3
-rwxr-xr-xbin/reproducible_maintenance.sh8
2 files changed, 8 insertions, 3 deletions
diff --git a/bin/reproducible_build.sh b/bin/reproducible_build.sh
index 7cbb4134..2007347e 100755
--- a/bin/reproducible_build.sh
+++ b/bin/reproducible_build.sh
@@ -854,7 +854,8 @@ share_buildinfo() {
curl -s -X PUT --max-time 30 --data-binary @- "https://buildinfo.debian.net/api/submit" < ./${X}/$BUILDINFO_SIGNED > $TMPFILE || log_error "Could not submit buildinfo from ${X} to http://buildinfo.debian.net/api/submit"
cat $TMPFILE
if grep -q "500 Internal Server Error" $TMPFILE ; then
- echo no irc_message debian-reproducible "${BUILD_URL} got error code 500 from buildinfo.debian.net"
+ MESSAGE="$(date -u ) - ${BUILD_URL}console got error code 500 from buildinfo.debian.net"
+ echo -e "$MESSAGE" | tee -a /var/log/jenkins/reproducible-submit2buildinfo.debian.net.log
fi
rm $TMPFILE
done
diff --git a/bin/reproducible_maintenance.sh b/bin/reproducible_maintenance.sh
index 8a4d79e8..bec96f39 100755
--- a/bin/reproducible_maintenance.sh
+++ b/bin/reproducible_maintenance.sh
@@ -469,7 +469,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 /var/log/jenkins/reproducible-env-changes.log /var/log/postgresql/postgresql-9.4-main.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 /var/log/jenkins/reproducible-submit2buildinfo.debian.net.log /var/log/postgresql/postgresql-9.4-main.log ; do
if [ -s $PROBLEM ] ; then
TMPFILE=$(mktemp --tmpdir=$TEMPDIR maintenance-XXXXXXXXXXXX)
if [ "$(dirname $PROBLEM)" = "/var/log/jenkins" ] ; then
@@ -506,7 +506,11 @@ if [ "$HOSTNAME" = "$MAINNODE" ] && [ $(date -u +%H) -eq 0 ] ; then
fi
# send mail if we found issues
if [ -s $TMPFILE ] && ! grep -q "no problems yesterday…" $TMPFILE ; then
- cat $TMPFILE | mail -s "$(basename $PROBLEM) found" qa-jenkins-scm@lists.alioth.debian.org
+ local CC=""
+ if [ "$(basename $PROBLEM)" = "reproducible-submit2buildinfo.debian.net.log" ]; then
+ CC="-c lamby@debian.org"
+ fi
+ cat $TMPFILE | mail -s "$(basename $PROBLEM) found" $CC qa-jenkins-scm@lists.alioth.debian.org
fi
rm -f $TMPFILE
fi