[Qa-jenkins-scm] [jenkins.debian.net] 01/01: reproducible archlinux: only cause warning for maintenance job if updating archlinux schroot fails

[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 56b38f8a346c53d45c8acbdb695bf98d586db08f
Author: Holger Levsen <holger at layer-acht.org>
Date:   Wed Jan 6 12:06:51 2016 +0100

    reproducible archlinux: only cause warning for maintenance job if updating archlinux schroot fails
---
 bin/reproducible_maintenance.sh | 10 +++++++++-
 logparse/reproducible.rules     |  1 +
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/bin/reproducible_maintenance.sh b/bin/reproducible_maintenance.sh
index 2a60a70..fab9f67 100755
--- a/bin/reproducible_maintenance.sh
+++ b/bin/reproducible_maintenance.sh
@@ -100,11 +100,19 @@ done
 set -e
 
 # for Archlinux
+set +e
 if [ "$HOSTNAME" = "${ARCHLINUX_BUILD_NODE}" ] ; then
 	echo "$(date -u) - updating Archlinux schroot now."
 	schroot --directory /tmp -c source:jenkins-reproducible-archlinux -u root -- pacman -Syu --noconfirm
-	echo "$(date -u) - updating Archlinux schroot done."
+	RESULT=$?
+	if [ $RESULT -eq 1 ] ; then
+		echo "Warning: failed to update Archlinux schroot."
+		DIRTY=true
+	else
+		echo "$(date -u) - updating Archlinux schroot done."
+	fi
 fi
+set -e
 
 # delete old temp directories
 echo "$(date -u) - Deleting temp directories, older than 2 days."
diff --git a/logparse/reproducible.rules b/logparse/reproducible.rules
index 828f1aa..dbd54bc 100644
--- a/logparse/reproducible.rules
+++ b/logparse/reproducible.rules
@@ -13,3 +13,4 @@ warning /Warning: cannot update html pages for.+/
 warning /Warning: too much difference for .+, aborting. Please investigate and update manually./
 warning /Warning: couldn't delete old files from.+/
 warning /Warning: failed to update the .+ schroot./
+warning /Warning: failed to update Archlinux schroot./

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